diff --git a/etherpad-docker.sh b/etherpad-docker.sh
index 186c5b8..994d6c6 100644
--- a/etherpad-docker.sh
+++ b/etherpad-docker.sh
@@ -88,12 +88,7 @@ sudo -u postgres psql <<DB
 CREATE DATABASE ${ETHERPAD_DB_NAME};
 CREATE USER ${ETHERPAD_DB_USER} WITH ENCRYPTED PASSWORD '${ETHERPAD_DB_PASS}';
 GRANT ALL PRIVILEGES ON DATABASE ${ETHERPAD_DB_NAME} TO ${ETHERPAD_DB_USER};
-\c ${ETHERPAD_DB_NAME}
-ALTER SCHEMA public OWNER TO ${ETHERPAD_DB_USER};
-GRANT USAGE ON SCHEMA public TO ${ETHERPAD_DB_USER};
-GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ${ETHERPAD_DB_USER};
-GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ${ETHERPAD_DB_USER};
-ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL ON TABLES TO ${ETHERPAD_DB_USER};
+GRANT CREATE, USAGE ON SCHEMA public TO ${ETHERPAD_DB_USER};
 DB
 
 # Check fot docker if not running then execute
@@ -122,14 +117,17 @@ fi
 if [ "$(grep -c etherpad "$WS_CONF")" != 0 ]; then
     echo "> Webserver seems configured, skipping..."
 elif [ -f "$WS_CONF" ]; then
+    echo "> Setting up webserver configuration file..."
     if ! grep -q 'map $http_upgrade $connection_upgrade' "$WS_CONF"; then
+        echo "  > Setting mapping upgrade connection."
         sed -i "/$WS_MATCH2/i # This is required to proxy Grafana Live WebSocket connections or Etherpad" "$WS_CONF"
         sed -i "/$WS_MATCH2/i map \$http_upgrade \$connection_upgrade {" "$WS_CONF"
         sed -i "/$WS_MATCH2/i \ \ default upgrade;" "$WS_CONF"
         sed -i "/$WS_MATCH2/i \ \ '' close;" "$WS_CONF"
         sed -i "/$WS_MATCH2/i }" "$WS_CONF"
+    else
+        echo "  > Upgrade connection mapping already setup."
     fi
-    echo "> Setting up webserver configuration file..."
     sed -i "/$WS_CONF_MATCH1/i \ \ \ \ #Etherpad block" "$WS_CONF"
     sed -i "/$WS_CONF_MATCH1/i \ \ \ \ location \^\~\ \/etherpad\/ {" "$WS_CONF"
     sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_http_version 1.1;" "$WS_CONF"
diff --git a/jra_nextcloud.sh b/jra_nextcloud.sh
index f6de6ef..2a4c85b 100644
--- a/jra_nextcloud.sh
+++ b/jra_nextcloud.sh
@@ -196,6 +196,7 @@ sudo -u postgres psql <<DB
 CREATE DATABASE nextcloud_db;
 CREATE USER ${NC_DB_USER} WITH ENCRYPTED PASSWORD '${NC_DB_PASSWD}';
 GRANT ALL PRIVILEGES ON DATABASE ${NC_DB} TO ${NC_DB_USER};
+GRANT CREATE, USAGE ON SCHEMA public TO ${NC_DB_USER};
 DB
 echo -e "\nDone!\n"