diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..b7c75df
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+# Added to prevent permission problems when building without using super user privileges
+
+./database/volume
+./docker/backend/uploads
+./log/backend
+./log/frontend
\ No newline at end of file
diff --git a/docker/php/setup.sh b/docker/php/setup.sh
index 6b2bdbd..27ea774 100644
--- a/docker/php/setup.sh
+++ b/docker/php/setup.sh
@@ -11,21 +11,10 @@ echo "Ready...."
 sudo -u www-data -s -- <<EOF
     # Export variables for www-data user so they
     # are accessible when running wp CLI
-    export WP_ENV="$WP_ENV"
-    export WP_HOME="$WP_HOME"
     export WP_DB_HOST="$WP_DB_HOST"
     export MYSQL_DATABASE="$MYSQL_DATABASE"
     export MYSQL_USER="$MYSQL_USER"
     export MYSQL_PASSWORD="$MYSQL_PASSWORD"
-    export WP_AUTH_KEY="$WP_AUTH_KEY"
-    export WP_SECURE_AUTH_KEY="$WP_SECURE_AUTH_KEY"
-    export WP_LOGGED_IN_KEY="$WP_LOGGED_IN_KEY"
-    export WP_NONCE_KEY="$WP_NONCE_KEY"
-    export WP_AUTH_SALT="$WP_AUTH_SALT"
-    export WP_SECURE_AUTH_SALT="$WP_SECURE_AUTH_SALT"
-    export WP_LOGGED_IN_SALT="$WP_LOGGED_IN_SALT"
-    export WP_NONCE_SALT="$WP_NONCE_SALT"
-    export WP_JWT_AUTH_SECRET_KEY="$WP_JWT_AUTH_SECRET_KEY"
 
     # Execute database update
     composer update-db