diff --git a/docker-compose-azerothcore-database.env b/docker-compose-azerothcore-database.env
index 2ee7a10..1e5ba1d 100644
--- a/docker-compose-azerothcore-database.env
+++ b/docker-compose-azerothcore-database.env
@@ -48,7 +48,7 @@ MYSQL_HEALTHCHECK_START_PERIOD=120s
 
 # NETWORK CONFIGURATION 
 # External database port
-DOCKER_DB_EXTERNAL_PORT=64306
+MYSQL_EXTERNAL_PORT=64306
 
 # DEPLOYMENT CONFIGURATION
 # Storage configuration for Portainer NFS deployments
diff --git a/docker-compose-azerothcore-database.yml b/docker-compose-azerothcore-database.yml
index b976328..a60ca8e 100644
--- a/docker-compose-azerothcore-database.yml
+++ b/docker-compose-azerothcore-database.yml
@@ -16,7 +16,7 @@ services:
       MYSQL_ALLOW_EMPTY_PASSWORD: no
       MYSQL_DATADIR: /var/lib/mysql-runtime
     ports:
-      - "${DOCKER_DB_EXTERNAL_PORT}:${MYSQL_PORT}"
+      - "${MYSQL_EXTERNAL_PORT}:${MYSQL_PORT}"
     volumes:
       - ${STORAGE_PATH}/mysql-data:/var/lib/mysql-persistent
       - type: tmpfs
diff --git a/docker-compose-azerothcore-services.env b/docker-compose-azerothcore-services.env
index 4d77e51..3a74112 100644
--- a/docker-compose-azerothcore-services.env
+++ b/docker-compose-azerothcore-services.env
@@ -53,9 +53,9 @@ WORLD_HEALTHCHECK_START_PERIOD=120s
 # NETWORK CONFIGURATION (REQUIRED)
 # ==============================================
 # External ports for game services
-DOCKER_AUTH_EXTERNAL_PORT=3784
-DOCKER_WORLD_EXTERNAL_PORT=8215
-DOCKER_SOAP_EXTERNAL_PORT=7778
+AUTH_EXTERNAL_PORT=3784
+WORLD_EXTERNAL_PORT=8215
+SOAP_EXTERNAL_PORT=7778
 
 # Internal ports (container side)
 AUTH_PORT=3724
diff --git a/docker-compose-azerothcore-services.yml b/docker-compose-azerothcore-services.yml
index 39ccc5a..9cbc667 100644
--- a/docker-compose-azerothcore-services.yml
+++ b/docker-compose-azerothcore-services.yml
@@ -209,7 +209,7 @@ services:
       AC_LOGGER_SERVER_CONFIG: "1,Console"
       AC_APPENDER_CONSOLE_CONFIG: "1,2,0"
     ports:
-      - "${DOCKER_AUTH_EXTERNAL_PORT}:${AUTH_PORT}"
+      - "${AUTH_EXTERNAL_PORT}:${AUTH_PORT}"
     restart: unless-stopped
     networks:
       - azerothcore
@@ -249,8 +249,8 @@ services:
       # Logger configuration - Use config file defaults with proper log level
       AC_LOG_LEVEL: "2"
     ports:
-      - "${DOCKER_WORLD_EXTERNAL_PORT}:${WORLD_PORT}"
-      - "${DOCKER_SOAP_EXTERNAL_PORT}:${SOAP_PORT}"
+      - "${WORLD_EXTERNAL_PORT}:${WORLD_PORT}"
+      - "${SOAP_EXTERNAL_PORT}:${SOAP_PORT}"
     volumes:
       - ${STORAGE_PATH}/data:/azerothcore/data
       - ${STORAGE_PATH}/config:/azerothcore/env/dist/etc
diff --git a/docker-compose-azerothcore-tools.env b/docker-compose-azerothcore-tools.env
index 4857ed9..f820076 100644
--- a/docker-compose-azerothcore-tools.env
+++ b/docker-compose-azerothcore-tools.env
@@ -8,7 +8,7 @@
 # DATABASE CONNECTION (REQUIRED)
 # ==============================================
 # Connect to core AzerothCore database
-DOCKER_DB_ROOT_PASSWORD=azerothcore123
+MYSQL_ROOT_PASSWORD=azerothcore123
 
 # Database connection for tools (connects to core stack)
 # Connect directly to ac-mysql container on azerothcore network
diff --git a/docker-compose-azerothcore-tools.yml b/docker-compose-azerothcore-tools.yml
index ae78d50..b03a2d4 100644
--- a/docker-compose-azerothcore-tools.yml
+++ b/docker-compose-azerothcore-tools.yml
@@ -13,8 +13,8 @@ services:
       PMA_HOST: ${PMA_HOST:-ac-mysql}
       PMA_PORT: ${PMA_PORT:-3306}
       PMA_USER: ${PMA_USER:-root}
-      PMA_PASSWORD: ${DOCKER_DB_ROOT_PASSWORD:-password}
-      MYSQL_ROOT_PASSWORD: ${DOCKER_DB_ROOT_PASSWORD:-password}
+      PMA_PASSWORD: ${MYSQL_ROOT_PASSWORD:-password}
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-password}
       PMA_ARBITRARY: ${PMA_ARBITRARY:-1}
       PMA_ABSOLUTE_URI: ${PMA_ABSOLUTE_URI:-}
       UPLOAD_LIMIT: ${PMA_UPLOAD_LIMIT:-300M}
@@ -38,7 +38,7 @@ services:
       - KEIRA_DATABASE_HOST=${KEIRA_DATABASE_HOST:-ac-mysql}
       - KEIRA_DATABASE_PORT=${KEIRA_DATABASE_PORT:-3306}
       - KEIRA_DATABASE_USER=root
-      - KEIRA_DATABASE_PASSWORD=${DOCKER_DB_ROOT_PASSWORD:-password}
+      - KEIRA_DATABASE_PASSWORD=${MYSQL_ROOT_PASSWORD:-password}
       - KEIRA_DATABASE_NAME=acore_world
     ports:
       - "${KEIRA3_EXTERNAL_PORT:-4201}:8080"
diff --git a/readme.md b/readme.md
index b2844ea..17619be 100644
--- a/readme.md
+++ b/readme.md
@@ -113,18 +113,18 @@ acore-compose/
 
 ### Service Containers
 
-| Container | Image | Purpose | Exposed Ports | Status |
-|-----------|-------|---------|---------------|---------|
-| `ac-mysql` | mysql:8.0 | MySQL database server | 64306:3306 | ✅ Healthy |
-| `ac-authserver` | acore/ac-wotlk-authserver:14.0.0-dev | Authentication server | 3784:3724 | ⚠️ Running (unhealthy) |
-| `ac-worldserver` | acore/ac-wotlk-worldserver:14.0.0-dev | Game world server | 8215:8085, 7778:7878 | ⚠️ Running (unhealthy) |
-| `ac-eluna` | acore/eluna-ts:master | Lua scripting engine | - | 🔄 Restarting |
-| `ac-phpmyadmin` | phpmyadmin/phpmyadmin:latest | Database management web UI | 8081:80 | ✅ Running |
-| `ac-grafana` | grafana/grafana:latest | Monitoring dashboard | 3001:3000 | ✅ Running |
-| `ac-influxdb` | influxdb:2.7-alpine | Metrics database | 8087:8086 | ✅ Running |
-| `ac-keira3` | uprightbass360/keira3:latest | Production database editor with API | 4201:8080 | ✅ Running (healthy) |
-| `ac-backup` | mysql:8.0 | Automated backup service | - | ✅ Running |
-| `ac-modules` | alpine/git:latest | Module management | - | ✅ Running |
+| Container | Image | Purpose | Exposed Ports |
+|-----------|-------|---------|---------------|
+| `ac-mysql` | mysql:8.0 | MySQL database server | 64306:3306 | 
+| `ac-authserver` | acore/ac-wotlk-authserver:14.0.0-dev | Authentication server | 3784:3724 | 
+| `ac-worldserver` | acore/ac-wotlk-worldserver:14.0.0-dev | Game world server | 8215:8085, 7778:7878 | 
+| `ac-eluna` | acore/eluna-ts:master | Lua scripting engine | - | 
+| `ac-phpmyadmin` | phpmyadmin/phpmyadmin:latest | Database management web UI | 8081:80| 
+| `ac-grafana` | grafana/grafana:latest | Monitoring dashboard | 3001:3000 | 
+| `ac-influxdb` | influxdb:2.7-alpine | Metrics database | 8087:8086 | 
+| `ac-keira3` | uprightbass360/keira3:latest | Production database editor with API | 4201:8080 | 
+| `ac-backup` | mysql:8.0 | Automated backup service | - | 
+| `ac-modules` | alpine/git:latest | Module management | - | 
 
 ### Container Relationships
 
@@ -231,9 +231,9 @@ Configuration is managed through separate `.env` files for each layer:
 - `BACKUP_RETENTION_DAYS`: Backup retention period
 
 #### Services Layer (`docker-compose-azerothcore-services.env`)
-- `DOCKER_AUTH_EXTERNAL_PORT`: Auth server external port (3784)
-- `DOCKER_WORLD_EXTERNAL_PORT`: World server external port (8215)
-- `DOCKER_SOAP_EXTERNAL_PORT`: SOAP API port (7778)
+- `AUTH_EXTERNAL_PORT`: Auth server external port (3784)
+- `WORLD_EXTERNAL_PORT`: World server external port (8215)
+- `SOAP_EXTERNAL_PORT`: SOAP API port (7778)
 - `PLAYERBOT_ENABLED`: Enable/disable playerbots (1/0)
 - `PLAYERBOT_MAX_BOTS`: Maximum number of bots (default: 40)