diff --git a/.env.production b/.env.production
index f15a8b0e9..1d0fd0fe1 100644
--- a/.env.production
+++ b/.env.production
@@ -1,10 +1,19 @@
+# Coolify Configuration
 APP_ID=
-APP_NAME=Coolify
 APP_KEY=
 
+# PostgreSQL Database Configuration
+DB_DATABASE=coolify-db
+DB_USERNAME=
 DB_PASSWORD=
+
+# Redis Configuration
 REDIS_PASSWORD=
 
+# Pusher Configuration
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
+
+# Additional Configuration
+SELF_HOSTED=true
\ No newline at end of file
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index b8156cab5..91e30f0ce 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -13,13 +13,12 @@ services:
       - /data/coolify/backups:/var/www/html/storage/app/backups
       - /data/coolify/webhooks-during-maintenance:/var/www/html/storage/app/webhooks-during-maintenance
     environment:
-      - PHP_MEMORY_LIMIT
-      - APP_ID
       - APP_ENV=production
-      - APP_DEBUG
-      - APP_NAME
+      - APP_NAME=Coolify
+      - APP_ID
       - APP_KEY
       - APP_URL
+      - APP_DEBUG
       - DB_CONNECTION
       - DB_HOST
       - DB_PORT
@@ -34,6 +33,7 @@ services:
       - 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
@@ -83,20 +83,22 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
+      soketi:
+        condition: service_healthy
   postgres:
     volumes:
       - coolify-db:/var/lib/postgresql/data
     environment:
-      POSTGRES_USER: "${DB_USERNAME:-coolify}"
+      POSTGRES_USER: "${DB_USERNAME}"
       POSTGRES_PASSWORD: "${DB_PASSWORD}"
-      POSTGRES_DB: "${DB_DATABASE:-coolify}"
+      POSTGRES_DB: "${DB_DATABASE:-coolify-db}"
     healthcheck:
       test:
         [
           "CMD-SHELL",
-          "pg_isready -U ${DB_USERNAME:-coolify}",
+          "pg_isready -U ${DB_USERNAME}",
           "-d",
-          "${DB_DATABASE:-coolify}"
+          "${DB_DATABASE:-coolify-db}"
         ]
       interval: 5s
       retries: 10
diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml
index af5ecc0f7..1f2c13b5c 100644
--- a/docker-compose.windows.yml
+++ b/docker-compose.windows.yml
@@ -71,16 +71,16 @@ services:
     volumes:
       - coolify-db:/var/lib/postgresql/data
     environment:
-      POSTGRES_USER: "${DB_USERNAME:-coolify}"
+      POSTGRES_USER: "${DB_USERNAME}"
       POSTGRES_PASSWORD: "${DB_PASSWORD}"
-      POSTGRES_DB: "${DB_DATABASE:-coolify}"
+      POSTGRES_DB: "${DB_DATABASE:-coolify-db}"
     healthcheck:
       test:
         [
           "CMD-SHELL",
-          "pg_isready -U ${DB_USERNAME:-coolify}",
+          "pg_isready -U ${DB_USERNAME}",
           "-d",
-          "${DB_DATABASE:-coolify}"
+          "${DB_DATABASE:-coolify-db}"
         ]
       interval: 5s
       retries: 10
diff --git a/docker-compose.yml b/docker-compose.yml
index 8eed44f8c..930c0a6b9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,7 @@ services:
         depends_on:
             - postgres
             - redis
+            - soketi
     postgres:
         image: postgres:15-alpine
         container_name: coolify-db
@@ -32,4 +33,4 @@ networks:
     coolify:
         name: coolify
         driver: bridge
-        external: true
+        external: false
diff --git a/scripts/install.sh b/scripts/install.sh
index 2aaaebaef..45c6b93bd 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -287,13 +287,21 @@ curl -fsSL $CDN/upgrade.sh -o /data/coolify/source/upgrade.sh
 # Copy .env.example if .env does not exist
 if [ ! -f /data/coolify/source/.env ]; then
     cp /data/coolify/source/.env.production /data/coolify/source/.env
-    sed -i "s|APP_ID=.*|APP_ID=$(openssl rand -hex 16)|g" /data/coolify/source/.env
-    sed -i "s|APP_KEY=.*|APP_KEY=base64:$(openssl rand -base64 32)|g" /data/coolify/source/.env
-    sed -i "s|DB_PASSWORD=.*|DB_PASSWORD=$(openssl rand -base64 32)|g" /data/coolify/source/.env
-    sed -i "s|REDIS_PASSWORD=.*|REDIS_PASSWORD=$(openssl rand -base64 32)|g" /data/coolify/source/.env
-    sed -i "s|PUSHER_APP_ID=.*|PUSHER_APP_ID=$(openssl rand -hex 32)|g" /data/coolify/source/.env
-    sed -i "s|PUSHER_APP_KEY=.*|PUSHER_APP_KEY=$(openssl rand -hex 32)|g" /data/coolify/source/.env
-    sed -i "s|PUSHER_APP_SECRET=.*|PUSHER_APP_SECRET=$(openssl rand -hex 32)|g" /data/coolify/source/.env
+   # Generate a secure APP_ID and APP_KEY
+    sed -i "s|^APP_ID=.*|APP_ID=$(openssl rand -hex 16)|" "$ENV_FILE"
+    sed -i "s|^APP_KEY=.*|APP_KEY=base64:$(openssl rand -base64 32)|" "$ENV_FILE"
+
+    # Generate a secure Postgres DB username and password
+    sed -i "s|^DB_USERNAME=.*|DB_USERNAME=$(openssl rand -hex 16)|" "$ENV_FILE"
+    sed -i "s|^DB_PASSWORD=.*|DB_PASSWORD=$(openssl rand -base64 32)|" "$ENV_FILE"
+
+    # Generate a secure Redis password
+    sed -i "s|^REDIS_PASSWORD=.*|REDIS_PASSWORD=$(openssl rand -base64 32)|" "$ENV_FILE"
+
+    # Generate secure Pusher credentials
+    sed -i "s|^PUSHER_APP_ID=.*|PUSHER_APP_ID=$(openssl rand -hex 32)|" "$ENV_FILE"
+    sed -i "s|^PUSHER_APP_KEY=.*|PUSHER_APP_KEY=$(openssl rand -hex 32)|" "$ENV_FILE"
+    sed -i "s|^PUSHER_APP_SECRET=.*|PUSHER_APP_SECRET=$(openssl rand -hex 32)|" "$ENV_FILE"
 fi
 
 # Merge .env and .env.production. New values will be added to .env