diff --git a/docker-compose.yml b/docker-compose.yml
index d78a874..534d62e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,15 +43,12 @@ services:
     volumes:
       - ./data/synapse:/data
     depends_on:
-      postgres:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
+      - postgres
+      - redis
     ports:
       - 127.0.0.1:8008:8008/tcp
     labels:
       synapse-autoheal: "true"
-    mem_limit: 2G
 
   sender1:
     image: matrixdotorg/synapse:$SYNAPSE_TAG
@@ -63,11 +60,9 @@ services:
       - ./data/synapse:/data
       - ./workers:/workers
     depends_on:
-      synapse:
-        condition: service_healthy
+      - synapse
     healthcheck:
       disable: true
-    mem_limit: 2G
 
   sender2:
     image: matrixdotorg/synapse:$SYNAPSE_TAG
@@ -79,11 +74,9 @@ services:
       - ./data/synapse:/data
       - ./workers:/workers
     depends_on:
-      synapse:
-        condition: service_healthy
+      - synapse
     healthcheck:
       disable: true
-    mem_limit: 2G
 
   sender3:
     image: matrixdotorg/synapse:$SYNAPSE_TAG
@@ -95,11 +88,9 @@ services:
       - ./data/synapse:/data
       - ./workers:/workers
     depends_on:
-      synapse:
-        condition: service_healthy
+      - synapse
     healthcheck:
       disable: true
-    mem_limit: 2G
 
   sender4:
     image: matrixdotorg/synapse:$SYNAPSE_TAG
@@ -111,11 +102,9 @@ services:
       - ./data/synapse:/data
       - ./workers:/workers
     depends_on:
-      synapse:
-        condition: service_healthy
+      - synapse
     healthcheck:
       disable: true
-    mem_limit: 2G
 
   media:
     image: matrixdotorg/synapse:$SYNAPSE_TAG
@@ -127,13 +116,11 @@ services:
       - ./data/synapse:/data
       - ./workers:/workers
     depends_on:
-      synapse:
-        condition: service_healthy
+      - synapse
     ports:
       - 127.0.0.1:8009:8008
     labels:
       synapse-autoheal: "true"
-    mem_limit: 2G
 
   generic1:
     image: matrixdotorg/synapse:$SYNAPSE_TAG
@@ -145,13 +132,11 @@ services:
       - ./data/synapse:/data
       - ./workers:/workers
     depends_on:
-      synapse:
-        condition: service_healthy
+      - synapse
     ports:
       - 127.0.0.1:8010:8008/tcp
     labels:
       synapse-autoheal: "true"
-    mem_limit: 2G
 
   generic2:
     image: matrixdotorg/synapse:$SYNAPSE_TAG
@@ -163,13 +148,11 @@ services:
       - ./data/synapse:/data
       - ./workers:/workers
     depends_on:
-      synapse:
-        condition: service_healthy
+      - synapse
     ports:
       - 127.0.0.1:8011:8008/tcp
     labels:
       synapse-autoheal: "true"
-    mem_limit: 2G
 
   generic3:
     image: matrixdotorg/synapse:$SYNAPSE_TAG
@@ -181,13 +164,11 @@ services:
       - ./data/synapse:/data
       - ./workers:/workers
     depends_on:
-      synapse:
-        condition: service_healthy
+      - synapse
     ports:
       - 127.0.0.1:8012:8008/tcp
     labels:
       synapse-autoheal: "true"
-    mem_limit: 2G
 
   generic4:
     image: matrixdotorg/synapse:$SYNAPSE_TAG
@@ -199,13 +180,11 @@ services:
       - ./data/synapse:/data
       - ./workers:/workers
     depends_on:
-      synapse:
-        condition: service_healthy
+      - synapse
     ports:
       - 127.0.0.1:8013:8008/tcp
     labels:
       synapse-autoheal: "true"
-    mem_limit: 2G
 
 
   coturn:
@@ -242,12 +221,11 @@ services:
       - ./data/prometheus:/prometheus
     networks:
       default:
-      grafana:
+      grafana_default:
         aliases:
           - synapse_prometheus
 
 
 networks:
-  grafana:
+  grafana_default:
     external: true
-    name: grafana_default