diff --git a/docker-compose.yml b/docker-compose.yml
index 74c2cf08..71dfb6f3 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,13 +15,13 @@ services:
       - NET_BIND_SERVICE                        # Required to bind to privileged ports (nbtscan)
 
     volumes:
-      - type: bind
-        source: ${APP_DATA_LOCATION}/netalertx/config
+      - type: volume
+        source: netalertx_config
         target: /app/config
         read_only: false
 
-      - type: bind
-        source: ${APP_DATA_LOCATION}/netalertx/db
+      - type: volume
+        source: netalertx_db
         target: /app/db
         read_only: false
 
@@ -30,26 +30,15 @@ services:
         target: /etc/localtime
         read_only: true
 
-      # Retain logs - comment out tmpfs /app/log if you want to retain logs between container restarts
-      # - /path/on/host/log:/app/log
-      # Optional logs
-      # - type: bind
-      #   source: ${LOGS_LOCATION}
-      #   target: /app/log
-      #   read_only: false
-
-      # Optional development mounts
-      - type: bind
-        source: ${DEV_LOCATION}
-        target: /app/front/plugins/custom
-        read_only: false
-
       # Use a custom Enterprise-configured nginx config for ldap or other settings
       # - /custom-enterprise.conf:/services/config/nginx/conf.active/netalertx.conf:ro
 
       # Test your plugin on the production container
       # - /path/on/host:/app/front/plugins/custom
 
+      # Retain logs - comment out tmpfs /app/log if you want to retain logs between container restarts
+      # - /path/on/host/log:/app/log
+
     # Tempfs mounts for writable directories in a read-only container and improve system performance
     tmpfs:
       # Speed up logging. This can be commented out to retain logs between container restarts
@@ -63,13 +52,11 @@ services:
       # /tmp is required by php for session save this should be reworked to /services/run/tmp
       - "/tmp:uid=20211,gid=20211,mode=1700,rw,noexec,nosuid,nodev,async,noatime,nodiratime"
     environment:
-      LISTEN_ADDR: 0.0.0.0                          # Listen for connections on all interfaces
-      PORT: ${PORT}                                 # Application port
-      ALWAYS_FRESH_INSTALL: ${ALWAYS_FRESH_INSTALL} # Set to true to reset your config and database on each container start
-      NETALERTX_DEBUG: 0                            # 0=kill all services and restart if any dies. 1 keeps running dead services.
-      TZ: ${TZ}                                     # Timezone, e.g. Europe/Paris
-      # APP_CONF_OVERRIDE={"SCAN_SUBNETS":"['192.168.1.0/24 --interface=eth1']","GRAPHQL_PORT":"20223","UI_theme":"Light"} # (optional) app.conf settings override
-      # LOADED_PLUGINS=["DHCPLSS","PIHOLE","ASUSWRT","FREEBOX"] # (optional) default plugins to load
+      LISTEN_ADDR: 0.0.0.0                      # Listen for connections on all interfaces
+      PORT: 20211                               # Application port
+      GRAPHQL_PORT: 20212                       # GraphQL API port
+      ALWAYS_FRESH_INSTALL: false               # Set to true to reset your config and database on each container start
+      NETALERTX_DEBUG: 0                        # 0=kill all services and restart if any dies. 1 keeps running dead services.
 
     # Resource limits to prevent resource exhaustion
     mem_limit: 2048m            # Maximum memory usage
@@ -85,7 +72,7 @@ services:
     # Always restart the container unless explicitly stopped
     restart: unless-stopped
 
-# volumes:
-#   netalertx_config:
-#   netalertx_db:
+volumes:
+  netalertx_config:
+  netalertx_db: