diff --git a/.env.production b/.env.production
index 099ec7c25..d3a1b17c5 100644
--- a/.env.production
+++ b/.env.production
@@ -1,16 +1,12 @@
-# Coolify Configuration
 APP_ID=
 APP_NAME=Coolify
 APP_KEY=
 
-# PostgreSQL Database Configuration
 DB_USERNAME=coolify
 DB_PASSWORD=
 
-# Redis Configuration
 REDIS_PASSWORD=
 
-# Pusher Configuration
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 459b93ac6..d5ae76dd1 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -13,46 +13,14 @@ services:
       - /data/coolify/backups:/var/www/html/storage/app/backups
       - /data/coolify/webhooks-during-maintenance:/var/www/html/storage/app/webhooks-during-maintenance
     environment:
-      - APP_ENV=production
-      - APP_NAME
-      - APP_ID
-      - APP_KEY
-      - APP_URL
-      - APP_DEBUG
-      - DB_DATABASE
-      - DB_USERNAME
-      - DB_PASSWORD
-      - DB_HOST
-      - DB_PORT
-      - DB_CONNECTION
-      - QUEUE_CONNECTION
-      - REDIS_HOST
-      - REDIS_PASSWORD
-      - HORIZON_BALANCE
-      - HORIZON_MIN_PROCESSES
-      - HORIZON_MAX_PROCESSES
-      - HORIZON_BALANCE_MAX_SHIFT
-      - HORIZON_BALANCE_COOLDOWN
-      - SSL_MODE=off
-      - PHP_MEMORY_LIMIT
-      - PHP_PM_CONTROL=dynamic
-      - PHP_PM_START_SERVERS=1
-      - PHP_PM_MIN_SPARE_SERVERS=1
-      - PHP_PM_MAX_SPARE_SERVERS=10
-      - PUSHER_HOST
-      - PUSHER_BACKEND_HOST
-      - PUSHER_PORT
-      - PUSHER_BACKEND_PORT
-      - PUSHER_SCHEME
-      - PUSHER_APP_ID
-      - PUSHER_APP_KEY
-      - PUSHER_APP_SECRET
-      - TERMINAL_PROTOCOL
-      - TERMINAL_HOST
-      - TERMINAL_PORT
-      - AUTOUPDATE
-      - SSH_MUX_ENABLED
-      - SSH_MUX_PERSIST_TIME
+      - APP_ENV=${APP_ENV:-production}
+      - PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT:-128M}
+      - PHP_PM_CONTROL=${PHP_PM_CONTROL:-dynamic}
+      - PHP_PM_START_SERVERS=${PHP_PM_START_SERVERS:-1}
+      - PHP_PM_MIN_SPARE_SERVERS=${PHP_PM_MIN_SPARE_SERVERS:-1}
+      - PHP_PM_MAX_SPARE_SERVERS=${PHP_PM_MAX_SPARE_SERVERS:-10}
+    env_file:
+      - /data/coolify/source/.env
     ports:
       - "${APP_PORT:-8000}:8080"
     expose:
diff --git a/other/nightly/.env.production b/other/nightly/.env.production
index 099ec7c25..d3a1b17c5 100644
--- a/other/nightly/.env.production
+++ b/other/nightly/.env.production
@@ -1,16 +1,12 @@
-# Coolify Configuration
 APP_ID=
 APP_NAME=Coolify
 APP_KEY=
 
-# PostgreSQL Database Configuration
 DB_USERNAME=coolify
 DB_PASSWORD=
 
-# Redis Configuration
 REDIS_PASSWORD=
 
-# Pusher Configuration
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
diff --git a/other/nightly/docker-compose.prod.yml b/other/nightly/docker-compose.prod.yml
index 459b93ac6..d5ae76dd1 100644
--- a/other/nightly/docker-compose.prod.yml
+++ b/other/nightly/docker-compose.prod.yml
@@ -13,46 +13,14 @@ services:
       - /data/coolify/backups:/var/www/html/storage/app/backups
       - /data/coolify/webhooks-during-maintenance:/var/www/html/storage/app/webhooks-during-maintenance
     environment:
-      - APP_ENV=production
-      - APP_NAME
-      - APP_ID
-      - APP_KEY
-      - APP_URL
-      - APP_DEBUG
-      - DB_DATABASE
-      - DB_USERNAME
-      - DB_PASSWORD
-      - DB_HOST
-      - DB_PORT
-      - DB_CONNECTION
-      - QUEUE_CONNECTION
-      - REDIS_HOST
-      - REDIS_PASSWORD
-      - HORIZON_BALANCE
-      - HORIZON_MIN_PROCESSES
-      - HORIZON_MAX_PROCESSES
-      - HORIZON_BALANCE_MAX_SHIFT
-      - HORIZON_BALANCE_COOLDOWN
-      - SSL_MODE=off
-      - PHP_MEMORY_LIMIT
-      - PHP_PM_CONTROL=dynamic
-      - PHP_PM_START_SERVERS=1
-      - PHP_PM_MIN_SPARE_SERVERS=1
-      - PHP_PM_MAX_SPARE_SERVERS=10
-      - PUSHER_HOST
-      - PUSHER_BACKEND_HOST
-      - PUSHER_PORT
-      - PUSHER_BACKEND_PORT
-      - PUSHER_SCHEME
-      - PUSHER_APP_ID
-      - PUSHER_APP_KEY
-      - PUSHER_APP_SECRET
-      - TERMINAL_PROTOCOL
-      - TERMINAL_HOST
-      - TERMINAL_PORT
-      - AUTOUPDATE
-      - SSH_MUX_ENABLED
-      - SSH_MUX_PERSIST_TIME
+      - APP_ENV=${APP_ENV:-production}
+      - PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT:-128M}
+      - PHP_PM_CONTROL=${PHP_PM_CONTROL:-dynamic}
+      - PHP_PM_START_SERVERS=${PHP_PM_START_SERVERS:-1}
+      - PHP_PM_MIN_SPARE_SERVERS=${PHP_PM_MIN_SPARE_SERVERS:-1}
+      - PHP_PM_MAX_SPARE_SERVERS=${PHP_PM_MAX_SPARE_SERVERS:-10}
+    env_file:
+      - /data/coolify/source/.env
     ports:
       - "${APP_PORT:-8000}:8080"
     expose:
diff --git a/package-lock.json b/package-lock.json
index e88e191b2..ec7c19f1a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,6 @@
                 "@tailwindcss/typography": "0.5.15",
                 "@xterm/addon-fit": "^0.10.0",
                 "@xterm/xterm": "^5.5.0",
-                "alpinejs": "3.14.7",
                 "ioredis": "5.4.1"
             },
             "devDependencies": {
@@ -1002,14 +1001,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/@vue/reactivity": {
-            "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.1.5.tgz",
-            "integrity": "sha512-1tdfLmNjWG6t/CsPldh+foumYFo3cpyCHgBYQ34ylaMsJ+SNHQ1kApMIa8jN+i593zQuaw3AdWH0nJTARzCFhg==",
-            "dependencies": {
-                "@vue/shared": "3.1.5"
-            }
-        },
         "node_modules/@vue/runtime-core": {
             "version": "3.5.13",
             "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.13.tgz",
@@ -1089,11 +1080,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/@vue/shared": {
-            "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.1.5.tgz",
-            "integrity": "sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA=="
-        },
         "node_modules/@xterm/addon-fit": {
             "version": "0.10.0",
             "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.10.0.tgz",
@@ -1107,15 +1093,6 @@
             "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz",
             "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A=="
         },
-        "node_modules/alpinejs": {
-            "version": "3.14.7",
-            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.14.7.tgz",
-            "integrity": "sha512-ScnbydNBcWVnCiVupD3wWUvoMPm8244xkvDNMxVCspgmap9m4QuJ7pjc+77UtByU+1+Ejg0wzYkP4mQaOMcvng==",
-            "license": "MIT",
-            "dependencies": {
-                "@vue/reactivity": "~3.1.1"
-            }
-        },
         "node_modules/ansi-regex": {
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",