diff --git a/docker-compose.nginx.yml b/docker-compose.nginx.yml
index 677db5e78..ba79f4e4d 100644
--- a/docker-compose.nginx.yml
+++ b/docker-compose.nginx.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   traefik:
     image: traefik:v2.2
-    container_name: appwrite_traefik
+    container_name: appwrite-traefik
     command:
       - --log.level=DEBUG
       - --api.insecure=true
@@ -89,7 +89,7 @@ services:
 
   mariadb:
     image: appwrite/mariadb:1.0.3 # fix issues when upgrading using: mysql_upgrade -u root -p
-    container_name: appwrite_mariadb
+    container_name: appwrite-mariadb
     restart: unless-stopped
     networks:
       - appwrite
@@ -106,7 +106,7 @@ services:
 
   maildev:
     image: djfarrelly/maildev
-    container_name: appwrite_maildev
+    container_name: appwrite-maildev
     restart: unless-stopped
     ports:
       - '1080:80'
@@ -115,7 +115,7 @@ services:
 
   # smtp:
   #   image: appwrite/smtp:1.0.1
-  #   container_name: appwrite_smtp
+  #   container_name: appwrite-smtp
   #   restart: unless-stopped
   #   networks:
   #     - appwrite
@@ -125,7 +125,7 @@ services:
 
   redis:
     image: redis:5.0
-    container_name: appwrite_redis
+    container_name: appwrite-redis
     restart: unless-stopped
     networks:
       - appwrite
@@ -134,7 +134,7 @@ services:
 
   clamav:
     image: appwrite/clamav:1.0.12
-    container_name: appwrite_clamav
+    container_name: appwrite-clamav
     restart: unless-stopped
     networks:
       - appwrite
@@ -143,7 +143,7 @@ services:
 
   influxdb:
     image: influxdb:1.6
-    container_name: appwrite_influxdb
+    container_name: appwrite-influxdb
     restart: unless-stopped
     networks:
       - appwrite
@@ -152,7 +152,7 @@ services:
 
   telegraf:
     image: appwrite/telegraf:1.0.0
-    container_name: appwrite_telegraf
+    container_name: appwrite-telegraf
     restart: unless-stopped
     networks:
       - appwrite
@@ -182,7 +182,7 @@ services:
 
   # chronograf:
   #   image: chronograf:1.5
-  #   container_name: appwrite_chronograf
+  #   container_name: appwrite-chronograf
   #   restart: unless-stopped
   #   networks:
   #   - appwrite
diff --git a/docker-compose.swoole.yml b/docker-compose.swoole.yml
index fce6c957d..7acda9ee5 100644
--- a/docker-compose.swoole.yml
+++ b/docker-compose.swoole.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   traefik:
     image: traefik:2.2
-    container_name: appwrite_traefik
+    container_name: appwrite-traefik
     command:
       - --log.level=DEBUG
       - --api.insecure=true
@@ -265,7 +265,7 @@ services:
 
   mariadb:
     image: appwrite/mariadb:1.0.3 # fix issues when upgrading using: mysql_upgrade -u root -p
-    container_name: appwrite_mariadb
+    container_name: appwrite-mariadb
     restart: unless-stopped
     networks:
       - appwrite
@@ -282,7 +282,7 @@ services:
 
   maildev:
     image: djfarrelly/maildev
-    container_name: appwrite_maildev
+    container_name: appwrite-maildev
     restart: unless-stopped
     ports:
       - '1080:80'
@@ -291,7 +291,7 @@ services:
 
   # smtp:
   #   image: appwrite/smtp:1.0.1
-  #   container_name: appwrite_smtp
+  #   container_name: appwrite-smtp
   #   restart: unless-stopped
   #   networks:
   #     - appwrite
@@ -301,7 +301,7 @@ services:
 
   redis:
     image: redis:5.0
-    container_name: appwrite_redis
+    container_name: appwrite-redis
     restart: unless-stopped
     networks:
       - appwrite
@@ -310,7 +310,7 @@ services:
 
   clamav:
     image: appwrite/clamav:1.0.12
-    container_name: appwrite_clamav
+    container_name: appwrite-clamav
     restart: unless-stopped
     networks:
       - appwrite
@@ -319,7 +319,7 @@ services:
 
   influxdb:
     image: influxdb:1.6
-    container_name: appwrite_influxdb
+    container_name: appwrite-influxdb
     restart: unless-stopped
     networks:
       - appwrite
@@ -328,7 +328,7 @@ services:
 
   telegraf:
     image: appwrite/telegraf:1.0.0
-    container_name: appwrite_telegraf
+    container_name: appwrite-telegraf
     restart: unless-stopped
     networks:
       - appwrite
@@ -358,7 +358,7 @@ services:
 
   # chronograf:
   #   image: chronograf:1.5
-  #   container_name: appwrite_chronograf
+  #   container_name: appwrite-chronograf
   #   restart: unless-stopped
   #   networks:
   #   - appwrite
diff --git a/docker-compose.yml b/docker-compose.yml
index fce6c957d..7acda9ee5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   traefik:
     image: traefik:2.2
-    container_name: appwrite_traefik
+    container_name: appwrite-traefik
     command:
       - --log.level=DEBUG
       - --api.insecure=true
@@ -265,7 +265,7 @@ services:
 
   mariadb:
     image: appwrite/mariadb:1.0.3 # fix issues when upgrading using: mysql_upgrade -u root -p
-    container_name: appwrite_mariadb
+    container_name: appwrite-mariadb
     restart: unless-stopped
     networks:
       - appwrite
@@ -282,7 +282,7 @@ services:
 
   maildev:
     image: djfarrelly/maildev
-    container_name: appwrite_maildev
+    container_name: appwrite-maildev
     restart: unless-stopped
     ports:
       - '1080:80'
@@ -291,7 +291,7 @@ services:
 
   # smtp:
   #   image: appwrite/smtp:1.0.1
-  #   container_name: appwrite_smtp
+  #   container_name: appwrite-smtp
   #   restart: unless-stopped
   #   networks:
   #     - appwrite
@@ -301,7 +301,7 @@ services:
 
   redis:
     image: redis:5.0
-    container_name: appwrite_redis
+    container_name: appwrite-redis
     restart: unless-stopped
     networks:
       - appwrite
@@ -310,7 +310,7 @@ services:
 
   clamav:
     image: appwrite/clamav:1.0.12
-    container_name: appwrite_clamav
+    container_name: appwrite-clamav
     restart: unless-stopped
     networks:
       - appwrite
@@ -319,7 +319,7 @@ services:
 
   influxdb:
     image: influxdb:1.6
-    container_name: appwrite_influxdb
+    container_name: appwrite-influxdb
     restart: unless-stopped
     networks:
       - appwrite
@@ -328,7 +328,7 @@ services:
 
   telegraf:
     image: appwrite/telegraf:1.0.0
-    container_name: appwrite_telegraf
+    container_name: appwrite-telegraf
     restart: unless-stopped
     networks:
       - appwrite
@@ -358,7 +358,7 @@ services:
 
   # chronograf:
   #   image: chronograf:1.5
-  #   container_name: appwrite_chronograf
+  #   container_name: appwrite-chronograf
   #   restart: unless-stopped
   #   networks:
   #   - appwrite