diff --git a/Dockerfile b/Dockerfile
index 90d18594c..ef05f6da5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,6 @@ COPY default.conf /etc/nginx/conf.d/default.conf
 RUN cp .env.example .env
 RUN composer install --no-dev
 
-
 EXPOSE 80
 EXPOSE 443
 
diff --git a/entrypoint.sh b/entrypoint.sh
index 495581c37..8a42015e0 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -8,17 +8,26 @@ do
   sleep 5
 done
 
-sed -i s/DB_HOST=127.0.0.1/DB_HOST=$DB_HOST/g /app/.env
-sed -i s/DB_DATABASE=panel/DB_DATABASE=$DB_DATABASE/g /app/.env
-sed -i s/DB_USERNAME=pterodactyl/DB_USERNAME=$DB_USERNAME/g /app/.env
-sed -i s/DB_PASSWORD=/DB_PASSWORD=$DB_PASSWORD/g /app/.env
+#sed -i s/DB_HOST=127.0.0.1/DB_HOST=$DB_HOST/g /app/.env
+#sed -i s/DB_DATABASE=panel/DB_DATABASE=$DB_DATABASE/g /app/.env
+#sed -i s/DB_USERNAME=pterodactyl/DB_USERNAME=$DB_USERNAME/g /app/.env
+#sed -i s/DB_PASSWORD=/DB_PASSWORD=$DB_PASSWORD/g /app/.env
 
 #echo "1"
 #chown -R www-data:www-data .
 #echo "2"
-#chmod -R 777 storage/* bootstrap/cache /var/run/php
+chmod -R 777 storage/* bootstrap/cache /var/run/php /app/.env
 echo "3"
-php artisan key:generate --force
+
+if [ "$(cat .env)" == "" ]; then
+  cat /app/.env.example > /app/.env
+fi
+
+if [ "$(cat .env | grep APP_KEY)" == "APP_KEY=" ]; then
+  echo "Generating New Key"
+  php artisan key:generate --force
+fi
+
 echo "4"
 php artisan migrate --force
 echo "5"