diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
index cc98641b40c..e5f71d5937c 100644
--- a/docker-compose-ci.yml
+++ b/docker-compose-ci.yml
@@ -201,7 +201,7 @@ services:
     image: kong/httpbin
 
   traefik:
-    image: traefik:v3.1
+    image: traefik:v3.6.6
     command:
       - --providers.docker=true
       - '--serverstransport.maxidleconnsperhost=-1'
diff --git a/docker-compose-local.yml b/docker-compose-local.yml
index c2d72c7492a..2adbfdf274e 100644
--- a/docker-compose-local.yml
+++ b/docker-compose-local.yml
@@ -1,11 +1,6 @@
-version: '3.8'
-
 services:
   rocketchat:
     platform: linux/amd64
-    build:
-      dockerfile: apps/meteor/.docker/Dockerfile.alpine
-      context: /tmp/build
     image: ghcr.io/${LOWERCASE_REPOSITORY}/rocket.chat:${DOCKER_TAG}
     environment:
       - TEST_MODE=true
@@ -29,10 +24,6 @@ services:
 
   authorization-service:
     platform: linux/amd64
-    build:
-      dockerfile: ee/apps/authorization-service/Dockerfile
-      args:
-        SERVICE: authorization-service
     image: ghcr.io/${LOWERCASE_REPOSITORY}/authorization-service:${DOCKER_TAG}
     environment:
       - 'MONGO_URL=${MONGO_URL}'
@@ -45,10 +36,6 @@ services:
 
   account-service:
     platform: linux/amd64
-    build:
-      dockerfile: ee/apps/account-service/Dockerfile
-      args:
-        SERVICE: account-service
     image: ghcr.io/${LOWERCASE_REPOSITORY}/account-service:${DOCKER_TAG}
     environment:
       - MONGO_URL=${MONGO_URL}
@@ -61,10 +48,6 @@ services:
 
   presence-service:
     platform: linux/amd64
-    build:
-      dockerfile: ee/apps/presence-service/Dockerfile
-      args:
-        SERVICE: presence-service
     image: ghcr.io/${LOWERCASE_REPOSITORY}/presence-service:${DOCKER_TAG}
     environment:
       - MONGO_URL=${MONGO_URL}
@@ -77,10 +60,6 @@ services:
 
   ddp-streamer-service:
     platform: linux/amd64
-    build:
-      dockerfile: ee/apps/ddp-streamer/Dockerfile
-      args:
-        SERVICE: ddp-streamer
     image: ghcr.io/${LOWERCASE_REPOSITORY}/ddp-streamer-service:${DOCKER_TAG}
     environment:
       - MONGO_URL=${MONGO_URL}
@@ -99,10 +78,6 @@ services:
 
   queue-worker-service:
     platform: linux/amd64
-    build:
-      dockerfile: ee/apps/queue-worker/Dockerfile
-      args:
-        SERVICE: queue-worker
     image: ghcr.io/${LOWERCASE_REPOSITORY}/queue-worker-service:${DOCKER_TAG}
     environment:
       - MONGO_URL=${MONGO_URL}
@@ -115,10 +90,6 @@ services:
 
   omnichannel-transcript-service:
     platform: linux/amd64
-    build:
-      dockerfile: ee/apps/omnichannel-transcript/Dockerfile
-      args:
-        SERVICE: omnichannel-transcript
     image: ghcr.io/${LOWERCASE_REPOSITORY}/omnichannel-transcript-service:${DOCKER_TAG}
     environment:
       - MONGO_URL=${MONGO_URL}
@@ -142,7 +113,7 @@ services:
       bash -c
         "mongod --replSet $$MONGODB_REPLICA_SET_NAME --bind_ip_all &
           sleep 2;
-          until mongosh --eval \"db.adminCommand('ping')\"; do 
+          until mongosh --eval \"db.adminCommand('ping')\"; do
             echo '=====> Waiting for Mongo...';
             sleep 1;
           done;
@@ -155,9 +126,10 @@ services:
     image: nats:2.6-alpine
 
   traefik:
-    image: traefik:v2.8
+    image: traefik:v3.6.6
     command:
       - --providers.docker=true
+      - '--serverstransport.maxidleconnsperhost=-1'
     ports:
       - 3000:80
     volumes:
diff --git a/ee/packages/federation-matrix/docker-compose.test.yml b/ee/packages/federation-matrix/docker-compose.test.yml
index 77fa416d52d..40dbd4e2249 100644
--- a/ee/packages/federation-matrix/docker-compose.test.yml
+++ b/ee/packages/federation-matrix/docker-compose.test.yml
@@ -5,21 +5,21 @@ networks:
 
 services:
   traefik:
-    image: traefik:v2.9
+    image: traefik:v3.6.6
     profiles:
       - test
       - element
     command:
-      - "--api.insecure=true"
+      - '--api.insecure=true'
       # - "--log.level=DEBUG"
-      - "--providers.docker=true"
-      - "--providers.docker.exposedbydefault=false"
-      - "--entrypoints.web.address=:80"
-      - "--entrypoints.websecure.address=:443"
+      - '--providers.docker=true'
+      - '--providers.docker.exposedbydefault=false'
+      - '--entrypoints.web.address=:80'
+      - '--entrypoints.websecure.address=:443'
     ports:
-      - "80:80"
-      - "443:443"
-      - "8080:8080"
+      - '80:80'
+      - '443:443'
+      - '8080:8080'
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - ./docker-compose/traefik/traefik.yml:/etc/traefik/traefik.yml:ro
@@ -39,7 +39,7 @@ services:
       element-net:
         aliases: [hs1, rc1, rc.host, element]
 
-# HomeServer 1 (synapse)
+  # HomeServer 1 (synapse)
   hs1:
     image: matrixdotorg/synapse:latest
     profiles:
@@ -71,13 +71,13 @@ services:
     networks:
       - hs1-net
     labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.hs1.rule=Host(`hs1`)"
-      - "traefik.http.routers.hs1.entrypoints=websecure"
-      - "traefik.http.routers.hs1.tls=true"
-      - "traefik.http.services.hs1.loadbalancer.server.port=8008"
+      - 'traefik.enable=true'
+      - 'traefik.http.routers.hs1.rule=Host(`hs1`)'
+      - 'traefik.http.routers.hs1.entrypoints=websecure'
+      - 'traefik.http.routers.hs1.tls=true'
+      - 'traefik.http.services.hs1.loadbalancer.server.port=8008'
 
-# Rocket.Chat rc1
+  # Rocket.Chat rc1
   rc1:
     build:
       context: ${ROCKETCHAT_BUILD_CONTEXT:-./test/dist}
@@ -109,15 +109,15 @@ services:
     depends_on:
       - mongo
     labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.rc1.rule=Host(`rc1`)"
-      - "traefik.http.routers.rc1.entrypoints=websecure"
-      - "traefik.http.routers.rc1.tls=true"
-      - "traefik.http.services.rc1.loadbalancer.server.port=3000"
+      - 'traefik.enable=true'
+      - 'traefik.http.routers.rc1.rule=Host(`rc1`)'
+      - 'traefik.http.routers.rc1.entrypoints=websecure'
+      - 'traefik.http.routers.rc1.tls=true'
+      - 'traefik.http.services.rc1.loadbalancer.server.port=3000'
       # HTTPS Redirect
-      - "traefik.http.middlewares.rc1.redirectscheme.scheme=https"
-      - "traefik.http.routers.rc1-http.rule=Host(`rc1`)"
-      - "traefik.http.routers.rc1-http.middlewares=rc1"
+      - 'traefik.http.middlewares.rc1.redirectscheme.scheme=https'
+      - 'traefik.http.routers.rc1-http.rule=Host(`rc1`)'
+      - 'traefik.http.routers.rc1-http.middlewares=rc1'
 
   mongo:
     image: mongo:${MONGODB_FEDERATION_VERSION:-8.0}
@@ -126,7 +126,7 @@ services:
       - element
     restart: on-failure
     ports:
-      - "27017:27017"
+      - '27017:27017'
     entrypoint: |
       bash -c
         "mongod --replSet rs0 --bind_ip_all &
@@ -153,12 +153,12 @@ services:
     networks:
       - element-net
     labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.element.rule=Host(`element`)"
-      - "traefik.http.routers.element.entrypoints=websecure"
-      - "traefik.http.routers.element.tls=true"
-      - "traefik.http.services.element.loadbalancer.server.port=80"
+      - 'traefik.enable=true'
+      - 'traefik.http.routers.element.rule=Host(`element`)'
+      - 'traefik.http.routers.element.entrypoints=websecure'
+      - 'traefik.http.routers.element.tls=true'
+      - 'traefik.http.services.element.loadbalancer.server.port=80'
       # HTTPS Redirect
-      - "traefik.http.middlewares.element.redirectscheme.scheme=https"
-      - "traefik.http.routers.element-http.rule=Host(`element`)"
-      - "traefik.http.routers.element-http.middlewares=element"
+      - 'traefik.http.middlewares.element.redirectscheme.scheme=https'
+      - 'traefik.http.routers.element-http.rule=Host(`element`)'
+      - 'traefik.http.routers.element-http.middlewares=element'