diff --git a/build/fpm/entrypoint.sh b/build/fpm/entrypoint.sh
index 2f70c5c5048bfac1800e6d1688e210bb4078415a..809fa57d3742b10157a009c5a5d8d6ad75c78752 100644
--- a/build/fpm/entrypoint.sh
+++ b/build/fpm/entrypoint.sh
@@ -1,5 +1,7 @@
 #! /bin/sh
 
+set -e
+
 _term() {
     echo "Stopping Process!"
     kill -TERM "$fpm" 2>/dev/null
@@ -12,8 +14,9 @@ then
   pwd
   ls -alh
   cp .env.example .env
-  php artisan key:generate
+  php artisan key:generate || rm .env
 fi
+php artisan inspire
 
 $@ &
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 0cab4d3e295cda66742407ad238456cc15e23bf4..67b99977abcc76b79c7730509de4e672f39b1eb6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,8 @@ services:
       - ./app:/html
   fpm:
     restart: unless-stopped
+    depends_on:
+      - composer
     build:
       dockerfile: ./build/fpm/Dockerfile
       target: ${ENVIRONMENT}