diff --git a/.env b/.env
index 128ddcbc..7ab4755d 100755
--- a/.env
+++ b/.env
@@ -6,8 +6,7 @@ LOGS_LOCATION=/path/to/docker_logs
 
 #ENVIRONMENT VARIABLES
 
-TZ=Europe/Paris
-NETALERTX_PORT=20211
+PORT=20211
 
 #DEVELOPMENT VARIABLES
 
diff --git a/install/docker/docker-compose.dev.yml b/install/docker/docker-compose.dev.yml
index a2c12b24..6854934b 100644
--- a/install/docker/docker-compose.dev.yml
+++ b/install/docker/docker-compose.dev.yml
@@ -27,9 +27,9 @@ services:
     environment:
       PUID: ${NETALERTX_UID:-20211}
       PGID: ${NETALERTX_GID:-20211}
-      LISTEN_ADDR: ${NETALERTX_LISTEN_ADDR:-0.0.0.0}
-      PORT: ${NETALERTX_PORT:-20211}
-      GRAPHQL_PORT: ${NETALERTX_GRAPHQL_PORT:-20212}
+      LISTEN_ADDR: ${LISTEN_ADDR:-0.0.0.0}
+      PORT: ${PORT:-20211}
+      GRAPHQL_PORT: ${GRAPHQL_PORT:-20212}
     mem_limit: 2048m
     mem_reservation: 1024m
     cpu_shares: 512
diff --git a/install/docker/docker-compose.yml b/install/docker/docker-compose.yml
index 5dea86b0..3f842a62 100644
--- a/install/docker/docker-compose.yml
+++ b/install/docker/docker-compose.yml
@@ -27,9 +27,9 @@ services:
     environment:
       PUID: ${NETALERTX_UID:-20211}
       PGID: ${NETALERTX_GID:-20211}
-      LISTEN_ADDR: ${NETALERTX_LISTEN_ADDR:-0.0.0.0}
-      PORT: ${NETALERTX_PORT:-20211}
-      GRAPHQL_PORT: ${NETALERTX_GRAPHQL_PORT:-20212}
+      LISTEN_ADDR: ${LISTEN_ADDR:-0.0.0.0}
+      PORT: ${PORT:-20211}
+      GRAPHQL_PORT: ${GRAPHQL_PORT:-20212}
     mem_limit: 2048m
     mem_reservation: 1024m
     cpu_shares: 512