diff --git a/docker-compose.yml b/docker-compose.yml
index f149b9a..296aa37 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     expose:
       - "9000"
     volumes:
-      - .:/var/www/app
+      - .:/var/www/app:delegated
     depends_on:
       - mysql
     networks:
@@ -26,7 +26,7 @@ services:
       - "${APP_PORT:-8000}:80"
     volumes:
       - ./docker/nginx.conf:/etc/nginx/conf.d/default.conf
-      - .:/var/www/app
+      - .:/var/www/app:delegated
     depends_on:
       - app
     networks:
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 6a6984e..7ede441 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -3,26 +3,26 @@
 cd /var/www/app
 
 echo "====================== Running entrypoint script...  ====================== "
-
 if [ ! -f ".env" ]; then
     echo " > Ope, gotta create an .env file!"
 
     cp .env.example .env
 fi
 
-if ( ! grep -q "^APP_KEY=" ".env" || grep -q "^APP_KEY=$" ".env"); then
-    echo " > Ah, APP_KEY is missing in .env file. Generating a new key!"
-    
-    /usr/local/bin/php artisan key:generate
-fi
-
 echo "====================== Checking for updates...  ====================== "
 /usr/bin/git pull
 
 echo "====================== Installing Composer dependencies...  ====================== "
 /usr/local/bin/composer install
 
-echo "====================== Install NPM dependencies and build frontend...  ====================== "
+echo "====================== Validating environment...  ====================== "
+if ( ! grep -q "^APP_KEY=" ".env" || grep -q "^APP_KEY=$" ".env"); then
+    echo " > Ah, APP_KEY is missing in .env file. Generating a new key!"
+    
+    /usr/local/bin/php artisan key:generate --force
+fi
+
+echo "====================== Installing NPM dependencies and building frontend...  ====================== "
 /usr/bin/npm install 
 /usr/bin/npm run build