diff --git a/33/Dockerfile b/33/Dockerfile
index db66955..805a018 100644
--- a/33/Dockerfile
+++ b/33/Dockerfile
@@ -134,10 +134,12 @@ RUN set -eux; \
     export GNUPGHOME="$(mktemp -d)"; \
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
-    tar -xjf nextcloud.tar.bz2 -C /var/www/; \
+    tar -xjf nextcloud.tar.bz2 -C /var/src/; \
     rm -rf "$GNUPGHOME" nextcloud.tar.bz2 nextcloud.tar.bz2.asc; \
-    rm -rf /var/www/nextcloud/updater; \
-    chown -R www-data:www-data /var/www/nextcloud
+    rm -rf /var/src/nextcloud/updater; \
+    mkdir -p /usr/src/nextcloud/data; \
+    mkdir -p /usr/src/nextcloud/custom_apps; \
+    chmod +x /usr/src/nextcloud/occ; \
 
 # set recommended PHP.ini settings
 # see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
@@ -160,8 +162,8 @@ RUN { \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
     } >  "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
         \
-    mkdir /var/www/data;
-
+    mkdir /var/www/data; \
+    chown -R www-data /var/www;
 
 RUN {\
      echo RemoteIPHeader X-Real-IP ;\
diff --git a/33/entrypoint.sh b/33/entrypoint.sh
index e458428..8f32d09 100644
--- a/33/entrypoint.sh
+++ b/33/entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-set -e
+set -eu
 
 # version_greater A B returns whether A > B
 version_greater() {
@@ -236,7 +236,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                             exit 1
                         fi
                         if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
-                            echo "Setting trusted domains…"
+                            echo "Setting trusted domains?"
                             NC_TRUSTED_DOMAIN_IDX=1
                             for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
                                 DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')