diff --git a/.templates/00-banner.sh b/.templates/00-banner.sh
index aec146ed0..ad3a3e9dd 100755
--- a/.templates/00-banner.sh
+++ b/.templates/00-banner.sh
@@ -41,3 +41,10 @@ fi
 # ==============================================================================
 # Global actions for all addons
 # ==============================================================================
+if bashio::config.has_value "PUID" && bashio::config.has_value "GUID"; then
+    bashio::log.green "Setting user to $PUID:$PGID"
+    groupmod -o -g "$PGID" abc
+    usermod -o -u "$PUID" abc
+    bashio::log.blue \
+        '-----------------------------------------------------------'
+fi
diff --git a/nextcloud/rootfs/etc/cont-init.d/01-folders.sh b/nextcloud/rootfs/etc/cont-init.d/01-folders.sh
index e76d67e8c..062375f6a 100755
--- a/nextcloud/rootfs/etc/cont-init.d/01-folders.sh
+++ b/nextcloud/rootfs/etc/cont-init.d/01-folders.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/with-contenv bashio
 # shellcheck shell=bash
 
-PUID="$(bashio::config "PUID")"
-PGID="$(bashio::config "PGID")"
-groupmod -o -g "$PGID" abc
-usermod -o -u "$PUID" abc
+if bashio::config.has_value "PUID" && bashio::config.has_value "GUID"; then
+    bashio::log.green "Setting user to $PUID:$PGID"
+    groupmod -o -g "$PGID" abc
+    usermod -o -u "$PUID" abc
+fi
 
 echo "Updating permissions..."
 echo "... Config directory : /data"
diff --git a/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh b/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh
index 0c4a29b69..bcf90a8ef 100755
--- a/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh
+++ b/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh
@@ -35,7 +35,7 @@ fi
 
 # Specify launcher
 PUID=$(bashio::config "PUID")
-LAUNCHER="sudo -u \#$PUID php /data/config/www/nextcloud/occ"
+LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ"
 
 # Inform if new version available
 function nextcloud_download {
@@ -67,10 +67,10 @@ elif [[ $($LAUNCHER -V 2>&1) == *"Composer autoloader not found"* ]]; then
     bashio::log.red " Missing files detected, Nextcloud will reinstall "
     bashio::log.red "--------------------------------------------------"
     touch /reinstall
-    sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair"
-    sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair-share-owner"
-    sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade"
-    sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:mode --off"
+    sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair"
+    sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair-share-owner"
+    sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade"
+    sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:mode --off"
 elif [[ $($LAUNCHER -V 2>&1) == *"Nextcloud"* ]]; then
     # Log
     bashio::log.green "----------------------------------------"
@@ -84,10 +84,10 @@ else
     bashio::log.red "$($LAUNCHER -V 2>&1)"
     bashio::log.red "------------------------------------------------------------------"
     bashio::exit.nok
-    sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair"
-    sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair-share-owner"
-    sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade"
-    sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:mode --off"
+    sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair"
+    sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair-share-owner"
+    sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade"
+    sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:mode --off"
 fi
 
 echo " "
@@ -118,8 +118,8 @@ if [ -f /reinstall ]; then
     /./etc/s6-overlay/s6-rc.d/init-nextcloud-config/run
     # RESET PERMISSIONS
     /./etc/cont-init.d/01-folders.sh
-    sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair"
-    sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair-share-owner"
-    sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade"
-    sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:mode --off"
+    sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair"
+    sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair-share-owner"
+    sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade"
+    sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:mode --off"
 fi
diff --git a/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh b/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh
index 2f856b565..43e3f040b 100755
--- a/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh
+++ b/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh
@@ -24,15 +24,15 @@ function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4
 if ! bashio::config.true "disable_updates"; then
     bashio::log.green "Auto_updater set, checking for updates"
     # Install new version
-    sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/updater/updater.phar --no-interaction"
-    sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade"
+    sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/updater/updater.phar --no-interaction"
+    sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade"
     # Install additional versions
     while [[ $(occ update:check 2>&1) == *"update available"* ]]; do
         bashio::log.yellow "-----------------------------------------------------------------------"
         bashio::log.yellow "  new version available, updating. Please do not turn off your addon!  "
         bashio::log.yellow "-----------------------------------------------------------------------"
-        sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/updater/updater.phar --no-interaction"
-        sudo -u \#"$PUID" -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade"
+        sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/updater/updater.phar --no-interaction"
+        sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade"
     done
     # Reset permissions
     /./etc/cont-init.d/01-folders.sh
diff --git a/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh b/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh
index 0994502c0..87cb6b090 100755
--- a/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh
+++ b/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh
@@ -8,7 +8,7 @@ if [ -f /notinstalled ]; then exit 0; fi
 # Specify launcher
 PUID=$(bashio::config "PUID")
 PGID=$(bashio::config "PGID")
-LAUNCHER="sudo -u \#$PUID php /data/config/www/nextcloud/occ"
+LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ"
 
 if $LAUNCHER fulltextsearch:test &>/dev/null; then
     echo "Full Text Search is already working"