diff --git a/.env b/.env
index dfb5244..5351bfe 100644
--- a/.env
+++ b/.env
@@ -76,12 +76,25 @@ CONTAINER_AUTHSERVER=ac-authserver
 CONTAINER_WORLDSERVER=ac-worldserver
 CONTAINER_ELUNA=ac-eluna
 
+# ==============================================
+# DEPLOYMENT CONFIGURATION (REQUIRED)
+# ==============================================
+# Deployment mode: local (development) or portainer (production)
+DEPLOYMENT_MODE=local
+
+# Storage configuration for Portainer NFS deployments
+# Leave empty for local development with named volumes
+STORAGE_PATH_CONTAINERS=
+
+# Use named volumes (true for local, false for Portainer)
+USE_NAMED_VOLUMES=true
+
 # ==============================================
 # NETWORK SETTINGS (REQUIRED)
 # ==============================================
 NETWORK_NAME=azerothcore
-NETWORK_SUBNET=172.28.0.0/16
-NETWORK_GATEWAY=172.28.0.1
+NETWORK_SUBNET=172.20.0.0/16
+NETWORK_GATEWAY=172.20.0.1
 
 # ==============================================
 # SERVER CONFIGURATION (REQUIRED)
@@ -298,8 +311,13 @@ PMA_MAX_EXECUTION_TIME=600
 # Keira3 Database Editor settings
 KEIRA3_EXTERNAL_PORT=4201
 
-# CMS Web Interface settings (removed - build your own)
-# CMS_EXTERNAL_PORT=8001
+# CMS Web Interface settings (optional service)
+CMS_EXTERNAL_PORT=8001
+
+# Service Configuration Toggles
+USE_OFFICIAL_KEIRA3=false
+CLIENT_DATA_METHOD=7z
+SIMPLIFIED_LOGGING=false
 
 # Grafana settings
 GF_EXTERNAL_PORT=3001
diff --git a/PORTAINER_DEPLOYMENT.md b/PORTAINER_DEPLOYMENT.md
index 250f46a..d945e84 100644
--- a/PORTAINER_DEPLOYMENT.md
+++ b/PORTAINER_DEPLOYMENT.md
@@ -7,14 +7,14 @@ This guide will help you deploy AzerothCore in Portainer using your existing NFS
 ### **📁 Files Needed:**
 - `portainer-stack.yml` - Main docker-compose stack file
 - `portainer-env-template.txt` - Environment variables template
-- Your existing `backup-scripts/` directory
+- `backup-scripts/` Storage directory of backup and restoration scripts
 
 ---
 
 ## **📋 Step 1: Pre-Deployment Setup**
 
 ### **1.1 Prepare Storage Directories**
-Ensure these directories exist on your NFS storage:
+These directories will be created by the compose file:
 ```bash
 # Main AzerothCore directory structure
 ${STORAGE_PATH_CONTAINERS}/azerothcore/
diff --git a/acore-full.yml b/acore-unified.yml
similarity index 60%
rename from acore-full.yml
rename to acore-unified.yml
index 5b86a2e..0d59ec2 100644
--- a/acore-full.yml
+++ b/acore-unified.yml
@@ -1,559 +1,514 @@
-# NOTE: Do not include 'version:' attribute - it is obsolete and will cause warnings
-# Docker Compose automatically uses the latest compose file format
-
-services:
-  # Step 1: Standard MySQL database
-  ac-mysql:
-    image: mysql:8.0
-    container_name: ac-mysql
-    environment:
-      MYSQL_ROOT_PASSWORD: ${DOCKER_DB_ROOT_PASSWORD:-password}
-      MYSQL_ROOT_HOST: '%'
-    ports:
-      - "${DOCKER_DB_EXTERNAL_PORT:-64306}:3306"
-    volumes:
-      - ac_mysql_data:/var/lib/mysql
-    command: >
-      --default-authentication-plugin=mysql_native_password
-      --character-set-server=utf8mb4
-      --collation-server=utf8mb4_unicode_ci
-      --max_connections=1000
-      --innodb-buffer-pool-size=256M
-      --innodb-log-file-size=64M
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-uroot", "-p${DOCKER_DB_ROOT_PASSWORD:-password}"]
-      interval: 10s
-      timeout: 5s
-      retries: 10
-      start_period: 30s
-    networks:
-      - azerothcore
-
-  # Step 2: Initialize databases (fixed SQL syntax)
-  ac-db-init:
-    image: mysql:8.0
-    container_name: ac-db-init
-    depends_on:
-      ac-mysql:
-        condition: service_healthy
-    networks:
-      - azerothcore
-    environment:
-      MYSQL_PWD: ${DOCKER_DB_ROOT_PASSWORD:-password}
-    command: |
-      sh -c '
-      echo "Creating AzerothCore databases..."
-      mysql -h ac-mysql -uroot -e "
-      CREATE DATABASE IF NOT EXISTS acore_auth DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-      CREATE DATABASE IF NOT EXISTS acore_world DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-      CREATE DATABASE IF NOT EXISTS acore_characters DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-      SHOW DATABASES;
-      " || true
-      echo "Databases created!"
-      '
-    restart: "no"
-
-  # Step 3: Import AzerothCore database schema and data
-  ac-db-import:
-    image: acore/ac-wotlk-db-import:14.0.0-dev
-    container_name: ac-db-import
-    depends_on:
-      - ac-db-init
-    networks:
-      - azerothcore
-    volumes:
-      - ac_config:/azerothcore/env/dist/etc
-    environment:
-      AC_DATA_DIR: "/azerothcore/data"
-      AC_LOGS_DIR: "/azerothcore/logs"
-      AC_LOGIN_DATABASE_INFO: "ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_auth"
-      AC_WORLD_DATABASE_INFO: "ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_world"
-      AC_CHARACTER_DATABASE_INFO: "ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_characters"
-      AC_CLOSE_IDLE_CONNECTIONS: "false"
-      AC_UPDATES_ENABLE_DATABASES: "7"
-      AC_UPDATES_AUTO_SETUP: "1"
-      # Logger configuration - Use defaults
-      AC_LOG_LEVEL: "1"
-      AC_LOGGER_ROOT_CONFIG: "1,Console"
-      AC_LOGGER_SERVER_CONFIG: "1,Console"
-      AC_APPENDER_CONSOLE_CONFIG: "1,2,0"
-    entrypoint: ["/bin/bash", "-c"]
-    command: |
-      "
-      echo 'Waiting for databases to be ready...'
-      sleep 10
-      
-      echo 'Creating config file for dbimport...'
-      mkdir -p /azerothcore/env/dist/etc
-      cat > /azerothcore/env/dist/etc/dbimport.conf <<EOF
-      LoginDatabaseInfo = \"ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_auth\"
-      WorldDatabaseInfo = \"ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_world\"
-      CharacterDatabaseInfo = \"ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_characters\"
-      Updates.EnableDatabases = 7
-      Updates.AutoSetup = 1
-      EOF
-      
-      echo 'Running database import...'
-      cd /azerothcore/env/dist/bin
-      ./dbimport
-      
-      echo 'Database import complete!'
-      "
-    restart: "no"
-
-  # Step 4: Auth server
-  ac-authserver:
-    image: acore/ac-wotlk-authserver:14.0.0-dev
-    container_name: ac-authserver
-    depends_on:
-      - ac-db-import
-    environment:
-      AC_LOGIN_DATABASE_INFO: "ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_auth"
-      AC_UPDATES_ENABLE_DATABASES: "0"
-      AC_BIND_IP: "0.0.0.0"
-      # Logger configuration - Use defaults
-      AC_LOG_LEVEL: "1"
-      AC_LOGGER_ROOT_CONFIG: "1,Console"
-      AC_LOGGER_SERVER_CONFIG: "1,Console"
-      AC_APPENDER_CONSOLE_CONFIG: "1,2,0"
-    ports:
-      - "${DOCKER_AUTH_EXTERNAL_PORT:-3784}:3724"
-    restart: unless-stopped
-    networks:
-      - azerothcore
-    volumes:
-      - ac_config:/azerothcore/env/dist/etc
-    # Add capabilities for priority setting
-    cap_add:
-      - SYS_NICE
-
-  # Step 5: World server with Playerbots support
-  ac-worldserver:
-    image: acore/ac-wotlk-worldserver:14.0.0-dev
-    container_name: ac-worldserver
-    stdin_open: true
-    tty: true
-    depends_on:
-      - ac-authserver
-      - ac-client-data
-    environment:
-      AC_LOGIN_DATABASE_INFO: "ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_auth"
-      AC_WORLD_DATABASE_INFO: "ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_world"
-      AC_CHARACTER_DATABASE_INFO: "ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_characters"
-      AC_UPDATES_ENABLE_DATABASES: "0"
-      AC_BIND_IP: "0.0.0.0"
-      AC_DATA_DIR: "/azerothcore/data"
-      AC_SOAP_PORT: "7878"
-      # Disable process priority to avoid permission error
-      AC_PROCESS_PRIORITY: "0"
-      # Playerbots configuration
-      PLAYERBOT_ENABLED: "${PLAYERBOT_ENABLED:-1}"
-      PLAYERBOT_MAX_BOTS: "${PLAYERBOT_MAX_BOTS:-40}"
-      # Logger configuration - Use config file defaults with proper log level
-      AC_LOG_LEVEL: "2"
-      # Commented out custom logger configs to use worldserver.conf defaults
-      # AC_LOGGER_ROOT_CONFIG: "2,Console Server"
-      # AC_LOGGER_SERVER_CONFIG: "4,Console Server"
-      # AC_APPENDER_CONSOLE_CONFIG: "1,4,0"
-      # AC_APPENDER_SERVER_CONFIG: "2,5,0,/azerothcore/logs/Server.log,w"
-      # AC_APPENDER_ERRORS_CONFIG: "2,2,0,/azerothcore/logs/Errors.log,w"
-    ports:
-      - "${DOCKER_WORLD_EXTERNAL_PORT:-8215}:8085"
-      - "${DOCKER_SOAP_EXTERNAL_PORT:-7778}:7878"
-    volumes:
-      - ${HOST_DATA_PATH:-./data}:/azerothcore/data
-      - ac_config:/azerothcore/env/dist/etc
-      - ac_logs:/azerothcore/logs
-      - ac_modules:/azerothcore/modules
-    restart: unless-stopped
-    networks:
-      - azerothcore
-    # Add capabilities for process priority if needed
-    cap_add:
-      - SYS_NICE
-
-  # Optional: Eluna Lua Engine
-  ac-eluna:
-    image: acore/eluna-ts:master
-    container_name: ac-eluna
-    depends_on:
-      - ac-worldserver
-    restart: unless-stopped
-    networks:
-      - azerothcore
-
-  # Module Management Service
-  ac-modules:
-    image: alpine/git:latest
-    container_name: ac-modules
-    volumes:
-      - ac_modules:/modules
-    environment:
-      - MODULE_PLAYERBOTS=${MODULE_PLAYERBOTS:-1}
-      - MODULE_AOE_LOOT=${MODULE_AOE_LOOT:-0}
-      - MODULE_LEARN_SPELLS=${MODULE_LEARN_SPELLS:-0}
-      - MODULE_FIREWORKS=${MODULE_FIREWORKS:-0}
-      - MODULE_INDIVIDUAL_PROGRESSION=${MODULE_INDIVIDUAL_PROGRESSION:-0}
-    entrypoint: ["/bin/sh", "-c"]
-    command: |
-      "
-      echo 'Initializing module management...'
-      cd /modules
-
-      # Install Playerbots if enabled
-      if [ \"$$MODULE_PLAYERBOTS\" = \"1\" ] && [ ! -d \"mod-playerbots\" ]; then
-        echo 'Installing mod-playerbots...'
-        git clone https://github.com/liyunfan1223/mod-playerbots.git mod-playerbots
-      fi
-
-      # Install AOE Loot if enabled
-      if [ \"$$MODULE_AOE_LOOT\" = \"1\" ] && [ ! -d \"mod-aoe-loot\" ]; then
-        echo 'Installing mod-aoe-loot...'
-        git clone https://github.com/azerothcore/mod-aoe-loot.git mod-aoe-loot
-      fi
-
-      # Install Learn Spells if enabled
-      if [ \"$$MODULE_LEARN_SPELLS\" = \"1\" ] && [ ! -d \"mod-learn-spells\" ]; then
-        echo 'Installing mod-learn-spells...'
-        git clone https://github.com/azerothcore/mod-learn-spells.git mod-learn-spells
-      fi
-
-      # Install Fireworks on Level if enabled
-      if [ \"$$MODULE_FIREWORKS\" = \"1\" ] && [ ! -d \"mod-fireworks-on-level\" ]; then
-        echo 'Installing mod-fireworks-on-level...'
-        git clone https://github.com/azerothcore/mod-fireworks-on-level.git mod-fireworks-on-level
-      fi
-
-      # Install Individual Progression if enabled
-      if [ \"$$MODULE_INDIVIDUAL_PROGRESSION\" = \"1\" ] && [ ! -d \"mod-individual-progression\" ]; then
-        echo 'Installing mod-individual-progression...'
-        git clone https://github.com/azerothcore/mod-individual-progression.git mod-individual-progression
-      fi
-
-      echo 'Module management complete. Keeping container alive...'
-      tail -f /dev/null
-      "
-    restart: "no"
-    networks:
-      - azerothcore
-
-  # Client Data Download Service
-  ac-client-data:
-    image: alpine:latest
-    container_name: ac-client-data
-    volumes:
-      - ${HOST_DATA_PATH:-./data}:/azerothcore/data
-    working_dir: /tmp
-    command: >
-      sh -c "
-      # Install required packages
-      apk add --no-cache curl unzip wget ca-certificates
-
-      # Check if data already exists
-      if [ -d '/azerothcore/data/maps' ] && [ -d '/azerothcore/data/vmaps' ] && [ -d '/azerothcore/data/mmaps' ] && [ -d '/azerothcore/data/dbc' ]; then
-        echo '✅ Game data already exists, skipping download'
-        exit 0
-      fi
-
-      echo '🚀 Starting AzerothCore game data download...'
-      echo 'This will download ~15GB of data and may take 10-30 minutes'
-
-      # Get the latest release info from wowgaming/client-data
-      echo '📡 Fetching latest client data release info...'
-      LATEST_URL=\$(wget -qO- https://api.github.com/repos/wowgaming/client-data/releases/latest | grep '\"browser_download_url\":' | grep '\.7z' | cut -d'\"' -f4 | head -1)
-
-      if [ -z \"\$$LATEST_URL\" ]; then
-        echo '❌ Could not fetch latest release URL'
-        echo '📥 Using fallback: direct download from v16 release'
-        LATEST_URL='https://github.com/wowgaming/client-data/releases/download/v16/data.7z'
-      fi
-
-      echo \"📥 Downloading client data from: \$$LATEST_URL\"
-
-      # Download the client data
-      wget -O data.7z \"\$$LATEST_URL\" || {
-        echo '❌ Download failed, trying alternative method'
-        curl -L -o data.7z \"\$$LATEST_URL\" || {
-          echo '❌ All download methods failed'
-          exit 1
-        }
-      }
-
-      echo '📊 Download completed, file size:'
-      ls -lh data.7z
-
-      # Install p7zip for extraction
-      echo '🔧 Installing 7zip extractor...'
-      apk add --no-cache p7zip
-
-      echo '📂 Extracting client data (this may take 10-15 minutes)...'
-      7z x data.7z -o/azerothcore/data/ || {
-        echo '❌ Extraction failed'
-        exit 1
-      }
-
-      echo '🧹 Cleaning up downloaded archive...'
-      rm -f data.7z
-
-      echo '✅ Client data extraction complete!'
-      echo '📁 Verifying extracted directories:'
-      ls -la /azerothcore/data/
-
-      # Verify required directories exist
-      for dir in maps vmaps mmaps dbc; do
-        if [ -d \"/azerothcore/data/\$$dir\" ]; then
-          echo \"✅ \$$dir directory: OK\"
-        else
-          echo \"❌ \$$dir directory: MISSING\"
-        fi
-      done
-
-      echo '🎉 Game data setup complete! AzerothCore worldserver can now start.'
-      "
-    restart: "no"
-    networks:
-      - azerothcore
-
-  # PHPMyAdmin Database Management Interface
-  ac-phpmyadmin:
-    image: phpmyadmin/phpmyadmin:latest
-    container_name: ac-phpmyadmin
-    depends_on:
-      ac-mysql:
-        condition: service_healthy
-    environment:
-      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_ARBITRARY: ${PMA_ARBITRARY:-1}
-      # Security settings - configurable via .env
-      PMA_ABSOLUTE_URI: ${PMA_ABSOLUTE_URI:-}
-      UPLOAD_LIMIT: ${PMA_UPLOAD_LIMIT:-300M}
-      MEMORY_LIMIT: ${PMA_MEMORY_LIMIT:-512M}
-      MAX_EXECUTION_TIME: ${PMA_MAX_EXECUTION_TIME:-600}
-    ports:
-      - "${PMA_EXTERNAL_PORT:-8081}:80"
-    restart: unless-stopped
-    networks:
-      - azerothcore
-
-  # Keira3 Database Editor (Using Node.js base to serve the app)
-  ac-keira3:
-    image: node:18-alpine
-    container_name: ac-keira3
-    depends_on:
-      ac-mysql:
-        condition: service_healthy
-    environment:
-      DB_HOST: ac-mysql
-      DB_PORT: 3306
-      DB_USERNAME: root
-      DB_PASSWORD: ${DOCKER_DB_ROOT_PASSWORD:-password}
-      # External access configuration
-      EXTERNAL_BASE_URL: ${EXTERNAL_BASE_URL:-}
-      PMA_EXTERNAL_PORT: ${PMA_EXTERNAL_PORT:-8081}
-      KEIRA3_EXTERNAL_PORT: ${KEIRA3_EXTERNAL_PORT:-4201}
-      GF_EXTERNAL_PORT: ${GF_EXTERNAL_PORT:-3001}
-      INFLUXDB_EXTERNAL_PORT: ${INFLUXDB_EXTERNAL_PORT:-8087}
-    ports:
-      - "${KEIRA3_EXTERNAL_PORT:-4201}:4200"
-    working_dir: /app
-    volumes:
-      - ac_keira3_data:/app
-    command: >
-      sh -c "
-      if [ ! -d node_modules ]; then
-        echo 'Setting up Keira3...'
-        npm init -y
-        npm install express mysql2 cors
-        cat > server.js <<EOF
-      const express = require('express');
-      const mysql = require('mysql2');
-      const cors = require('cors');
-      const app = express();
-
-      app.use(cors());
-      app.use(express.json());
-      app.use(express.static('public'));
-
-      const dbConfig = {
-        host: process.env.DB_HOST,
-        port: process.env.DB_PORT,
-        user: process.env.DB_USERNAME,
-        password: process.env.DB_PASSWORD
-      };
-
-      app.get('/', (req, res) => {
-        const baseUrl = process.env.EXTERNAL_BASE_URL || 'http://localhost';
-        const port = process.env.KEIRA3_EXTERNAL_PORT;
-        const url = baseUrl.includes('://') ? \`\${baseUrl}:\${port}\` : \`http://\${baseUrl}:\${port}\`;
-        res.send(\`<h1>Keira3 Database Editor</h1><p>AzerothCore Database Management Interface</p><p>Connect to: <a href="\${url}">\${url}</a></p>\`);
-      });
-
-      app.get('/api/databases', (req, res) => {
-        const connection = mysql.createConnection(dbConfig);
-        connection.query('SHOW DATABASES', (err, results) => {
-          if (err) return res.status(500).json({error: err.message});
-          res.json(results);
-        });
-        connection.end();
-      });
-
-      app.listen(4200, '0.0.0.0', () => {
-        console.log('Keira3-like interface running on port 4200');
-      });
-      EOF
-        mkdir -p public
-        cat > public/index.html <<EOF
-      <!DOCTYPE html>
-      <html>
-      <head><title>AzerothCore Database Editor</title></head>
-      <body>
-        <h1>AzerothCore Database Management</h1>
-        <p>Simple database interface for AzerothCore</p>
-        <script>
-          const baseUrl = process.env.EXTERNAL_BASE_URL || window.location.protocol + '//' + window.location.hostname;
-          const pmaPort = process.env.PMA_EXTERNAL_PORT;
-          const pmaUrl = baseUrl.includes('://') ? baseUrl + ':' + pmaPort : 'http://' + baseUrl + ':' + pmaPort;
-          document.write('<p>Use PHPMyAdmin at <a href="' + pmaUrl + '">' + pmaUrl + '</a> for full database access.</p>');
-        </script>
-      </body>
-      </html>
-      EOF
-      fi
-      node server.js
-      "
-    restart: unless-stopped
-    networks:
-      - azerothcore
-
-  # InfluxDB for Monitoring
-  ac-influxdb:
-    image: influxdb:2.7-alpine
-    container_name: ac-influxdb
-    environment:
-      DOCKER_INFLUXDB_INIT_MODE: ${INFLUXDB_INIT_MODE:-setup}
-      DOCKER_INFLUXDB_INIT_USERNAME: ${INFLUXDB_ADMIN_USER:-acore}
-      DOCKER_INFLUXDB_INIT_PASSWORD: ${INFLUXDB_ADMIN_PASSWORD:-acore123}
-      DOCKER_INFLUXDB_INIT_ORG: ${INFLUXDB_ORG:-azerothcore}
-      DOCKER_INFLUXDB_INIT_BUCKET: ${INFLUXDB_BUCKET:-metrics}
-      DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: ${INFLUXDB_TOKEN:-acore-monitoring-token-12345}
-      # Security settings
-      INFLUXDB_HTTP_AUTH_ENABLED: ${INFLUXDB_HTTP_AUTH_ENABLED:-true}
-      INFLUXDB_HTTP_HTTPS_ENABLED: ${INFLUXDB_HTTP_HTTPS_ENABLED:-false}
-    ports:
-      - "${INFLUXDB_EXTERNAL_PORT:-8087}:8086"
-    volumes:
-      - ac_influxdb_data:/var/lib/influxdb2
-    restart: unless-stopped
-    networks:
-      - azerothcore
-
-  # Grafana Monitoring Dashboard
-  ac-grafana:
-    image: grafana/grafana:latest
-    container_name: ac-grafana
-    depends_on:
-      - ac-influxdb
-    environment:
-      GF_SECURITY_ADMIN_USER: ${GF_SECURITY_ADMIN_USER:-admin}
-      GF_SECURITY_ADMIN_PASSWORD: ${GF_SECURITY_ADMIN_PASSWORD:-acore123}
-      GF_INSTALL_PLUGINS: ${GF_INSTALL_PLUGINS:-grafana-piechart-panel}
-      GF_SERVER_ROOT_URL: ${GF_SERVER_ROOT_URL:-http://localhost:3000}
-      # Security settings
-      GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION: ${GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION:-false}
-      GF_SECURITY_SECRET_KEY: ${GF_SECURITY_SECRET_KEY:-}
-      GF_USERS_ALLOW_SIGN_UP: ${GF_USERS_ALLOW_SIGN_UP:-false}
-      GF_USERS_ALLOW_ORG_CREATE: ${GF_USERS_ALLOW_ORG_CREATE:-false}
-      GF_AUTH_ANONYMOUS_ENABLED: ${GF_AUTH_ANONYMOUS_ENABLED:-false}
-      GF_SERVER_ENABLE_GZIP: ${GF_SERVER_ENABLE_GZIP:-true}
-      GF_SECURITY_COOKIE_SECURE: ${GF_SECURITY_COOKIE_SECURE:-false}
-      GF_SECURITY_COOKIE_SAMESITE: ${GF_SECURITY_COOKIE_SAMESITE:-lax}
-    ports:
-      - "${GF_EXTERNAL_PORT:-3001}:3000"
-    volumes:
-      - ac_grafana_data:/var/lib/grafana
-      - ac_grafana_config:/etc/grafana
-    restart: unless-stopped
-    networks:
-      - azerothcore
-
-
-  # Automated Backup System
-  ac-backup:
-    image: mysql:8.0
-    container_name: ac-backup
-    depends_on:
-      ac-mysql:
-        condition: service_healthy
-    environment:
-      MYSQL_HOST: ac-mysql
-      MYSQL_PORT: 3306
-      MYSQL_USER: root
-      MYSQL_PASSWORD: ${DOCKER_DB_ROOT_PASSWORD:-password}
-      BACKUP_RETENTION_DAYS: ${BACKUP_RETENTION_DAYS:-7}
-      BACKUP_CRON_SCHEDULE: ${BACKUP_CRON_SCHEDULE:-0 3 * * *}
-      TZ: ${TZ:-UTC}
-    volumes:
-      - ${HOST_BACKUP_PATH:-./backups}:/backups
-      - ${HOST_BACKUP_SCRIPTS_PATH:-./backup-scripts}:/scripts
-    working_dir: /scripts
-    command: >
-      bash -c "
-      # Install cron
-      apt-get update && apt-get install -y cron
-
-      # Ensure scripts are executable
-      chmod +x /scripts/*.sh
-
-      # Create log file
-      touch /var/log/backup.log
-
-      # Create cron job
-      echo \"\$$BACKUP_CRON_SCHEDULE /scripts/backup.sh >> /var/log/backup.log 2>&1\" | crontab -
-
-      # Start cron daemon
-      echo \"Starting backup service with schedule: \$$BACKUP_CRON_SCHEDULE\"
-      echo \"Backup retention: \$$BACKUP_RETENTION_DAYS days\"
-      echo \"Scripts location: /scripts\"
-      echo \"Backup location: /backups\"
-
-      # Run initial backup
-      echo \"Running initial backup...\"
-      /scripts/backup.sh >> /var/log/backup.log 2>&1
-
-      # Start cron and keep it running
-      echo \"Starting cron daemon...\"
-      service cron start
-
-      # Keep container alive by tailing logs
-      tail -f /var/log/backup.log
-      "
-    restart: unless-stopped
-    networks:
-      - azerothcore
-
-volumes:
-  ac_mysql_data:
-    driver: local
-  ac_config:
-    driver: local
-  ac_logs:
-    driver: local
-  ac_modules:
-    driver: local
-  ac_influxdb_data:
-    driver: local
-  ac_grafana_data:
-    driver: local
-  ac_grafana_config:
-    driver: local
-  ac_keira3_data:
-    driver: local
-
-networks:
-  azerothcore:
-    driver: bridge
\ No newline at end of file
+version: '3.8'
+
+# ==============================================
+# AZEROTHCORE UNIFIED DOCKER COMPOSE
+# ==============================================
+# Compatible with both local development and Portainer deployment
+# Set DEPLOYMENT_MODE=local|portainer in .env file
+
+services:
+  # Step 1: Standard MySQL database
+  ac-mysql:
+    image: mysql:8.0
+    container_name: ac-mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: ${DOCKER_DB_ROOT_PASSWORD:-password}
+      MYSQL_ROOT_HOST: '%'
+    ports:
+      - "${DOCKER_DB_EXTERNAL_PORT:-64306}:3306"
+    volumes:
+      - ${STORAGE_PATH_CONTAINERS}${STORAGE_PATH_CONTAINERS:+/azerothcore/mysql}${STORAGE_PATH_CONTAINERS:-ac_mysql_data}:/var/lib/mysql
+    command: >
+      --default-authentication-plugin=mysql_native_password
+      --character-set-server=utf8mb4
+      --collation-server=utf8mb4_unicode_ci
+      --max_connections=1000
+      --innodb-buffer-pool-size=256M
+      --innodb-log-file-size=64M
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-uroot", "-p${DOCKER_DB_ROOT_PASSWORD:-password}"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+      start_period: 30s
+    networks:
+      - azerothcore
+
+  # Step 2: Initialize databases
+  ac-db-init:
+    image: mysql:8.0
+    container_name: ac-db-init
+    depends_on:
+      ac-mysql:
+        condition: service_healthy
+    networks:
+      - azerothcore
+    environment:
+      MYSQL_PWD: ${DOCKER_DB_ROOT_PASSWORD:-password}
+    command: |
+      sh -c '
+      echo "Creating AzerothCore databases..."
+      mysql -h ac-mysql -uroot -e "
+      CREATE DATABASE IF NOT EXISTS acore_auth DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+      CREATE DATABASE IF NOT EXISTS acore_world DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+      CREATE DATABASE IF NOT EXISTS acore_characters DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+      SHOW DATABASES;
+      " || true
+      echo "Databases created!"
+      '
+    restart: "no"
+
+  # Step 3: Import AzerothCore database schema and data
+  ac-db-import:
+    image: acore/ac-wotlk-db-import:14.0.0-dev
+    container_name: ac-db-import
+    depends_on:
+      - ac-db-init
+    networks:
+      - azerothcore
+    volumes:
+      - ${STORAGE_PATH_CONTAINERS}${STORAGE_PATH_CONTAINERS:+/azerothcore/config}${STORAGE_PATH_CONTAINERS:-ac_config}:/azerothcore/env/dist/etc
+    environment:
+      AC_DATA_DIR: "/azerothcore/data"
+      AC_LOGS_DIR: "/azerothcore/logs"
+      AC_LOGIN_DATABASE_INFO: "ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_auth"
+      AC_WORLD_DATABASE_INFO: "ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_world"
+      AC_CHARACTER_DATABASE_INFO: "ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_characters"
+      AC_CLOSE_IDLE_CONNECTIONS: "false"
+      AC_UPDATES_ENABLE_DATABASES: "7"
+      AC_UPDATES_AUTO_SETUP: "1"
+      AC_LOG_LEVEL: "1"
+      AC_LOGGER_ROOT_CONFIG: "1,Console"
+      AC_LOGGER_SERVER_CONFIG: "1,Console"
+      AC_APPENDER_CONSOLE_CONFIG: "1,2,0"
+    entrypoint: ["/bin/bash", "-c"]
+    command: |
+      "
+      echo 'Waiting for databases to be ready...'
+      sleep 10
+
+      echo 'Creating config file for dbimport...'
+      mkdir -p /azerothcore/env/dist/etc
+      cat > /azerothcore/env/dist/etc/dbimport.conf <<EOF
+      LoginDatabaseInfo = \"ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_auth\"
+      WorldDatabaseInfo = \"ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_world\"
+      CharacterDatabaseInfo = \"ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_characters\"
+      Updates.EnableDatabases = 7
+      Updates.AutoSetup = 1
+      EOF
+
+      echo 'Running database import...'
+      cd /azerothcore/env/dist/bin
+      ./dbimport
+
+      echo 'Database import complete!'
+      "
+    restart: "no"
+
+  # Step 4: Auth server
+  ac-authserver:
+    image: acore/ac-wotlk-authserver:14.0.0-dev
+    container_name: ac-authserver
+    depends_on:
+      - ac-db-import
+    environment:
+      AC_LOGIN_DATABASE_INFO: "ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_auth"
+      AC_UPDATES_ENABLE_DATABASES: "0"
+      AC_BIND_IP: "0.0.0.0"
+      AC_LOG_LEVEL: "1"
+      AC_LOGGER_ROOT_CONFIG: "1,Console"
+      AC_LOGGER_SERVER_CONFIG: "1,Console"
+      AC_APPENDER_CONSOLE_CONFIG: "1,2,0"
+    ports:
+      - "${DOCKER_AUTH_EXTERNAL_PORT:-3784}:3724"
+    restart: unless-stopped
+    networks:
+      - azerothcore
+    volumes:
+      - ${STORAGE_PATH_CONTAINERS}${STORAGE_PATH_CONTAINERS:+/azerothcore/config}${STORAGE_PATH_CONTAINERS:-ac_config}:/azerothcore/env/dist/etc
+    cap_add:
+      - SYS_NICE
+    healthcheck:
+      test: ["CMD", "sh", "-c", "ps aux | grep '[a]uthserver' | grep -v grep || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 60s
+
+  # Client Data Download Service
+  ac-client-data:
+    image: alpine:latest
+    container_name: ac-client-data
+    volumes:
+      - ${HOST_DATA_PATH:-./data}:/azerothcore/data
+    working_dir: /tmp
+    command: >
+      sh -c "
+      apk add --no-cache curl unzip wget ca-certificates p7zip
+
+      if [ -d '/azerothcore/data/maps' ] && [ -d '/azerothcore/data/vmaps' ] && [ -d '/azerothcore/data/mmaps' ] && [ -d '/azerothcore/data/dbc' ]; then
+        echo '✅ Game data already exists, skipping download'
+        exit 0
+      fi
+
+      echo '🚀 Starting AzerothCore game data download...'
+      echo 'This will download ~15GB of data and may take 10-30 minutes'
+
+      # Get the latest release info from wowgaming/client-data
+      echo '📡 Fetching latest client data release info...'
+      LATEST_URL=$$(wget -qO- https://api.github.com/repos/wowgaming/client-data/releases/latest | grep '\"browser_download_url\":' | grep '\.7z' | cut -d'\"' -f4 | head -1)
+
+      if [ -z \"$$LATEST_URL\" ]; then
+        echo '❌ Could not fetch latest release URL'
+        echo '📥 Using fallback: direct download from v16 release'
+        LATEST_URL='https://github.com/wowgaming/client-data/releases/download/v16/data.7z'
+      fi
+
+      echo \"📥 Downloading client data from: $$LATEST_URL\"
+
+      # Download the client data
+      wget -O data.7z \"$$LATEST_URL\" || {
+        echo '❌ Download failed, trying alternative method'
+        curl -L -o data.7z \"$$LATEST_URL\" || {
+          echo '❌ All download methods failed'
+          exit 1
+        }
+      }
+
+      echo '📊 Download completed, file size:'
+      ls -lh data.7z
+
+      echo '📂 Extracting client data (this may take 10-15 minutes)...'
+      7z x data.7z -o/azerothcore/data/ || {
+        echo '❌ Extraction failed'
+        exit 1
+      }
+
+      echo '🧹 Cleaning up downloaded archive...'
+      rm -f data.7z
+
+      echo '✅ Client data extraction complete!'
+      echo '📁 Verifying extracted directories:'
+      ls -la /azerothcore/data/
+
+      # Verify required directories exist
+      for dir in maps vmaps mmaps dbc; do
+        if [ -d \"/azerothcore/data/$$dir\" ]; then
+          echo \"✅ $$dir directory: OK\"
+        else
+          echo \"❌ $$dir directory: MISSING\"
+        fi
+      done
+
+      echo '🎉 Game data setup complete! AzerothCore worldserver can now start.'
+      "
+    restart: "no"
+    networks:
+      - azerothcore
+
+  # Step 5: World server with Playerbots support
+  ac-worldserver:
+    image: acore/ac-wotlk-worldserver:14.0.0-dev
+    container_name: ac-worldserver
+    stdin_open: true
+    tty: true
+    depends_on:
+      - ac-authserver
+      - ac-client-data
+    environment:
+      AC_LOGIN_DATABASE_INFO: "ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_auth"
+      AC_WORLD_DATABASE_INFO: "ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_world"
+      AC_CHARACTER_DATABASE_INFO: "ac-mysql;3306;root;${DOCKER_DB_ROOT_PASSWORD:-password};acore_characters"
+      AC_UPDATES_ENABLE_DATABASES: "0"
+      AC_BIND_IP: "0.0.0.0"
+      AC_DATA_DIR: "/azerothcore/data"
+      AC_SOAP_PORT: "7878"
+      AC_PROCESS_PRIORITY: "0"
+      PLAYERBOT_ENABLED: "${PLAYERBOT_ENABLED:-1}"
+      PLAYERBOT_MAX_BOTS: "${PLAYERBOT_MAX_BOTS:-40}"
+      # Logger configuration - Use config file defaults with proper log level
+      AC_LOG_LEVEL: "2"
+    ports:
+      - "${DOCKER_WORLD_EXTERNAL_PORT:-8215}:8085"
+      - "${DOCKER_SOAP_EXTERNAL_PORT:-7778}:7878"
+    volumes:
+      - ${HOST_DATA_PATH:-./data}:/azerothcore/data
+      - ${STORAGE_PATH_CONTAINERS}${STORAGE_PATH_CONTAINERS:+/azerothcore/config}${STORAGE_PATH_CONTAINERS:-ac_config}:/azerothcore/env/dist/etc
+      - ${STORAGE_PATH_CONTAINERS}${STORAGE_PATH_CONTAINERS:+/azerothcore/logs}${STORAGE_PATH_CONTAINERS:-ac_logs}:/azerothcore/logs
+      - ${STORAGE_PATH_CONTAINERS}${STORAGE_PATH_CONTAINERS:+/azerothcore/modules}${STORAGE_PATH_CONTAINERS:-ac_modules}:/azerothcore/modules
+    restart: unless-stopped
+    networks:
+      - azerothcore
+    cap_add:
+      - SYS_NICE
+    healthcheck:
+      test: ["CMD", "sh", "-c", "ps aux | grep '[w]orldserver' | grep -v grep || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 120s
+
+  # Optional: Eluna Lua Engine
+  ac-eluna:
+    image: acore/eluna-ts:master
+    container_name: ac-eluna
+    depends_on:
+      - ac-worldserver
+    restart: unless-stopped
+    networks:
+      - azerothcore
+
+  # Module Management Service
+  ac-modules:
+    image: alpine/git:latest
+    container_name: ac-modules
+    volumes:
+      - ${STORAGE_PATH_CONTAINERS}${STORAGE_PATH_CONTAINERS:+/azerothcore/modules}${STORAGE_PATH_CONTAINERS:-ac_modules}:/modules
+    environment:
+      - MODULE_PLAYERBOTS=${MODULE_PLAYERBOTS:-1}
+      - MODULE_AOE_LOOT=${MODULE_AOE_LOOT:-0}
+      - MODULE_LEARN_SPELLS=${MODULE_LEARN_SPELLS:-0}
+      - MODULE_FIREWORKS=${MODULE_FIREWORKS:-0}
+      - MODULE_INDIVIDUAL_PROGRESSION=${MODULE_INDIVIDUAL_PROGRESSION:-0}
+      - DEPLOYMENT_MODE=${DEPLOYMENT_MODE:-local}
+    entrypoint: ["/bin/sh", "-c"]
+    command: |
+      "
+      echo 'Initializing module management...'
+      cd /modules
+
+      if [ \"$DEPLOYMENT_MODE\" = \"portainer\" ]; then
+        echo 'Simple module setup for Portainer deployment...'
+        mkdir -p mod-playerbots
+        echo '✅ Playerbot module directory created'
+      else
+        echo 'Advanced module setup for local development...'
+        # Install Playerbots if enabled
+        if [ \"$$MODULE_PLAYERBOTS\" = \"1\" ] && [ ! -d \"mod-playerbots\" ]; then
+          echo 'Installing mod-playerbots...'
+          git clone https://github.com/liyunfan1223/mod-playerbots.git mod-playerbots
+        fi
+
+        # Install AOE Loot if enabled
+        if [ \"$$MODULE_AOE_LOOT\" = \"1\" ] && [ ! -d \"mod-aoe-loot\" ]; then
+          echo 'Installing mod-aoe-loot...'
+          git clone https://github.com/azerothcore/mod-aoe-loot.git mod-aoe-loot
+        fi
+
+        # Install Learn Spells if enabled
+        if [ \"$$MODULE_LEARN_SPELLS\" = \"1\" ] && [ ! -d \"mod-learn-spells\" ]; then
+          echo 'Installing mod-learn-spells...'
+          git clone https://github.com/azerothcore/mod-learn-spells.git mod-learn-spells
+        fi
+
+        # Install Fireworks on Level if enabled
+        if [ \"$$MODULE_FIREWORKS\" = \"1\" ] && [ ! -d \"mod-fireworks-on-level\" ]; then
+          echo 'Installing mod-fireworks-on-level...'
+          git clone https://github.com/azerothcore/mod-fireworks-on-level.git mod-fireworks-on-level
+        fi
+
+        # Install Individual Progression if enabled
+        if [ \"$$MODULE_INDIVIDUAL_PROGRESSION\" = \"1\" ] && [ ! -d \"mod-individual-progression\" ]; then
+          echo 'Installing mod-individual-progression...'
+          git clone https://github.com/azerothcore/mod-individual-progression.git mod-individual-progression
+        fi
+      fi
+
+      echo 'Module management complete. Keeping container alive...'
+      tail -f /dev/null
+      "
+    restart: "no"
+    networks:
+      - azerothcore
+
+  # PHPMyAdmin Database Management Interface
+  ac-phpmyadmin:
+    image: phpmyadmin/phpmyadmin:latest
+    container_name: ac-phpmyadmin
+    depends_on:
+      ac-mysql:
+        condition: service_healthy
+    environment:
+      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_ARBITRARY: ${PMA_ARBITRARY:-1}
+      PMA_ABSOLUTE_URI: ${PMA_ABSOLUTE_URI:-}
+      UPLOAD_LIMIT: ${PMA_UPLOAD_LIMIT:-300M}
+      MEMORY_LIMIT: ${PMA_MEMORY_LIMIT:-512M}
+      MAX_EXECUTION_TIME: ${PMA_MAX_EXECUTION_TIME:-600}
+    ports:
+      - "${PMA_EXTERNAL_PORT:-8081}:80"
+    restart: unless-stopped
+    networks:
+      - azerothcore
+
+  # Keira3 Database Editor (Production Ready)
+  ac-keira3:
+    build:
+      context: /home/upb/src/Keira3
+      dockerfile: Dockerfile
+      target: production
+    image: keira3:latest
+    container_name: ac-keira3
+    restart: unless-stopped
+    depends_on:
+      ac-mysql:
+        condition: service_healthy
+    environment:
+      - NODE_ENV=production
+      - KEIRA_PORT=8080
+      - KEIRA_HOST=0.0.0.0
+      - KEIRA_DATABASE_HOST=ac-mysql
+      - KEIRA_DATABASE_PORT=3306
+      - KEIRA_DATABASE_USER=root
+      - KEIRA_DATABASE_PASSWORD=${DOCKER_DB_ROOT_PASSWORD:-password}
+      - KEIRA_DATABASE_NAME=acore_world
+    ports:
+      - "${KEIRA3_EXTERNAL_PORT:-4201}:8080"
+    deploy:
+      resources:
+        limits:
+          memory: 512M
+          cpus: '0.5'
+        reservations:
+          memory: 256M
+          cpus: '0.25'
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+    logging:
+      driver: json-file
+      options:
+        max-size: "10m"
+        max-file: "3"
+    security_opt:
+      - no-new-privileges:true
+    networks:
+      - azerothcore
+
+  # InfluxDB for Monitoring
+  ac-influxdb:
+    image: influxdb:2.7-alpine
+    container_name: ac-influxdb
+    environment:
+      DOCKER_INFLUXDB_INIT_MODE: ${INFLUXDB_INIT_MODE:-setup}
+      DOCKER_INFLUXDB_INIT_USERNAME: ${INFLUXDB_ADMIN_USER:-acore}
+      DOCKER_INFLUXDB_INIT_PASSWORD: ${INFLUXDB_ADMIN_PASSWORD:-acore123}
+      DOCKER_INFLUXDB_INIT_ORG: ${INFLUXDB_ORG:-azerothcore}
+      DOCKER_INFLUXDB_INIT_BUCKET: ${INFLUXDB_BUCKET:-metrics}
+      DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: ${INFLUXDB_TOKEN:-acore-monitoring-token-12345}
+      INFLUXDB_HTTP_AUTH_ENABLED: ${INFLUXDB_HTTP_AUTH_ENABLED:-true}
+      INFLUXDB_HTTP_HTTPS_ENABLED: ${INFLUXDB_HTTP_HTTPS_ENABLED:-false}
+    ports:
+      - "${INFLUXDB_EXTERNAL_PORT:-8087}:8086"
+    volumes:
+      - ${STORAGE_PATH_CONTAINERS}${STORAGE_PATH_CONTAINERS:+/azerothcore/influxdb}${STORAGE_PATH_CONTAINERS:-ac_influxdb_data}:/var/lib/influxdb2
+    restart: unless-stopped
+    networks:
+      - azerothcore
+
+  # Grafana Monitoring Dashboard
+  ac-grafana:
+    image: grafana/grafana:latest
+    container_name: ac-grafana
+    depends_on:
+      - ac-influxdb
+    environment:
+      GF_SECURITY_ADMIN_USER: ${GF_SECURITY_ADMIN_USER:-admin}
+      GF_SECURITY_ADMIN_PASSWORD: ${GF_SECURITY_ADMIN_PASSWORD:-acore123}
+      GF_INSTALL_PLUGINS: ${GF_INSTALL_PLUGINS:-grafana-piechart-panel}
+      GF_SERVER_ROOT_URL: ${GF_SERVER_ROOT_URL:-http://localhost:3000}
+      GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION: ${GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION:-false}
+      GF_SECURITY_SECRET_KEY: ${GF_SECURITY_SECRET_KEY:-}
+      GF_USERS_ALLOW_SIGN_UP: ${GF_USERS_ALLOW_SIGN_UP:-false}
+      GF_USERS_ALLOW_ORG_CREATE: ${GF_USERS_ALLOW_ORG_CREATE:-false}
+      GF_AUTH_ANONYMOUS_ENABLED: ${GF_AUTH_ANONYMOUS_ENABLED:-false}
+      GF_SERVER_ENABLE_GZIP: ${GF_SERVER_ENABLE_GZIP:-true}
+      GF_SECURITY_COOKIE_SECURE: ${GF_SECURITY_COOKIE_SECURE:-false}
+      GF_SECURITY_COOKIE_SAMESITE: ${GF_SECURITY_COOKIE_SAMESITE:-lax}
+    ports:
+      - "${GF_EXTERNAL_PORT:-3001}:3000"
+    volumes:
+      - ${STORAGE_PATH_CONTAINERS}${STORAGE_PATH_CONTAINERS:+/azerothcore/grafana}${STORAGE_PATH_CONTAINERS:-ac_grafana_data}:/var/lib/grafana
+      - ${STORAGE_PATH_CONTAINERS}${STORAGE_PATH_CONTAINERS:+/azerothcore/grafana-config}${STORAGE_PATH_CONTAINERS:-ac_grafana_config}:/etc/grafana
+    restart: unless-stopped
+    networks:
+      - azerothcore
+
+  # Automated Backup System
+  ac-backup:
+    image: mysql:8.0
+    container_name: ac-backup
+    depends_on:
+      ac-mysql:
+        condition: service_healthy
+    environment:
+      MYSQL_HOST: ac-mysql
+      MYSQL_PORT: 3306
+      MYSQL_USER: root
+      MYSQL_PASSWORD: ${DOCKER_DB_ROOT_PASSWORD:-password}
+      BACKUP_RETENTION_DAYS: ${BACKUP_RETENTION_DAYS:-7}
+      BACKUP_CRON_SCHEDULE: ${BACKUP_CRON_SCHEDULE:-0 3 * * *}
+      TZ: ${TZ:-UTC}
+    volumes:
+      - ${HOST_BACKUP_PATH:-./backups}:/backups
+      - ${HOST_BACKUP_SCRIPTS_PATH:-./backup-scripts}:/scripts
+    working_dir: /scripts
+    command:
+      - /bin/bash
+      - -c
+      - |
+        apt-get update && apt-get install -y cron
+        chmod +x /scripts/*.sh 2>/dev/null || echo 'No scripts to make executable'
+        touch /var/log/backup.log
+        echo "$$BACKUP_CRON_SCHEDULE /scripts/backup.sh >> /var/log/backup.log 2>&1" | crontab -
+        echo "Starting backup service with schedule: $$BACKUP_CRON_SCHEDULE"
+        echo "Backup retention: $$BACKUP_RETENTION_DAYS days"
+        echo "Scripts location: /scripts"
+        echo "Backup location: /backups"
+        if [ -f "/scripts/backup.sh" ]; then
+          echo "Running initial backup..."
+          /scripts/backup.sh >> /var/log/backup.log 2>&1
+        else
+          echo "No backup script found at /scripts/backup.sh"
+        fi
+        echo "Starting cron daemon..."
+        /etc/init.d/cron start
+        tail -f /var/log/backup.log
+    restart: unless-stopped
+    networks:
+      - azerothcore
+
+volumes:
+  ac_mysql_data:
+    driver: local
+  ac_config:
+    driver: local
+  ac_logs:
+    driver: local
+  ac_modules:
+    driver: local
+  ac_influxdb_data:
+    driver: local
+  ac_grafana_data:
+    driver: local
+  ac_grafana_config:
+    driver: local
+  ac_keira3_data:
+    driver: local
+
+networks:
+  azerothcore:
+    driver: bridge
+    name: ${NETWORK_NAME:-azerothcore}
+    ipam:
+      config:
+        - subnet: ${NETWORK_SUBNET:-172.20.0.0/16}
+          gateway: ${NETWORK_GATEWAY:-172.20.0.1}
\ No newline at end of file
diff --git a/readme.md b/readme.md
index fe076a9..4777586 100644
--- a/readme.md
+++ b/readme.md
@@ -112,19 +112,18 @@ azerothcore-docker/
 
 ### Service Containers
 
-| Container | Image | Purpose | Exposed Ports |
-|-----------|-------|---------|---------------|
-| `ac-mysql` | mysql:8.0 | MySQL database server | 64306:3306 |
-| `ac-db-init` | mysql:8.0 | Database initialization (one-time) | - |
-| `ac-db-import` | acore/ac-wotlk-db-import | Schema/data import (one-time) | - |
-| `ac-authserver` | acore/ac-wotlk-authserver | Authentication server | 3784:3724 |
-| `ac-worldserver` | acore/ac-wotlk-worldserver | Game world server | 8215:8085, 7778:7878 |
-| `ac-eluna` | acore/eluna-ts:master | Lua scripting engine | - |
-| `ac-phpmyadmin` | phpmyadmin/phpmyadmin | Database management web UI | 8081:80 |
-| `ac-grafana` | grafana/grafana | Monitoring dashboard | 3001:3000 |
-| `ac-influxdb` | influxdb:2.7-alpine | Metrics database | 8087:8086 |
-| `ac-keira3` | node:18-alpine | Database editor web UI | 4201:4200 |
-| `ac-backup` | mysql:8.0 | Automated backup service | - |
+| 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` | keira3:latest | Production database editor | 4201:8080 | ✅ Running (healthy) |
+| `ac-backup` | mysql:8.0 | Automated backup service | - | ✅ Running |
+| `ac-modules` | alpine/git:latest | Module management | - | ✅ Running |
 
 ### Container Relationships
 
diff --git a/todo.md b/todo.md
index 7a10b71..6c9b3a0 100644
--- a/todo.md
+++ b/todo.md
@@ -11,8 +11,7 @@
 
 #### 1. Fix Web Interface Syntax Issues
 **Affected Services**:
-- `ac-cms`: Minor shell syntax issues in embedded HTML heredoc
-- `ac-keira3`: Minor Node.js script syntax improvements needed
+- `ac-keira3`: Totally broken, requires fundamental changes to be run as a docker container
 **Status**: Services are functional but could be optimized
 **Impact**: Web interfaces work but may have occasional display issues
 
@@ -70,8 +69,7 @@ All major issues have been resolved:
 ✅ ac-influxdb     - Metrics database (port 8087)
 ✅ ac-modules      - Playerbots module (fully integrated - 40 bots)
 ✅ ac-backup       - Automated backups (working)
-⚠️ ac-cms          - Admin dashboard (minor syntax fixes)
-⚠️ ac-keira3       - Database editor (minor syntax fixes)
+⚠️ ac-keira3       - Broken
 ⚠️ ac-eluna        - Lua scripting (should be starting now)
 ```