diff --git a/docker/docker-compose.2004.55.yaml b/docker/docker-compose.2004.55.yaml
index ecca60fdb..4d0a12ee7 100644
--- a/docker/docker-compose.2004.55.yaml
+++ b/docker/docker-compose.2004.55.yaml
@@ -1,14 +1,13 @@
 version: "3"
 
 services:
-        
+
   runtime-setup:
     image: async-http-client:20.04-5.5
     build:
       args:
         ubuntu_version: "focal"
         swift_version: "5.5"
-        
 
   test:
     image: async-http-client:20.04-5.5
diff --git a/docker/docker-compose.2004.56.yaml b/docker/docker-compose.2004.56.yaml
index 6d7b66e9e..ed61267a9 100644
--- a/docker/docker-compose.2004.56.yaml
+++ b/docker/docker-compose.2004.56.yaml
@@ -1,13 +1,13 @@
 version: "3"
 
 services:
-        
+
   runtime-setup:
     image: async-http-client:20.04-5.6
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.6-focal"
-        
+        ubuntu_version: "focal"
+        swift_version: "5.6"
 
   test:
     image: async-http-client:20.04-5.6
diff --git a/docker/docker-compose.2004.57.yaml b/docker/docker-compose.2004.57.yaml
new file mode 100644
index 000000000..16c564482
--- /dev/null
+++ b/docker/docker-compose.2004.57.yaml
@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: async-http-client:20.04-5.7
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-main-focal"
+
+  test:
+    image: async-http-client:20.04-5.7
+    environment: []
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: async-http-client:20.04-5.7
diff --git a/docker/docker-compose.2004.main.yaml b/docker/docker-compose.2004.main.yaml
index 55715ab72..11c7517ba 100644
--- a/docker/docker-compose.2004.main.yaml
+++ b/docker/docker-compose.2004.main.yaml
@@ -1,13 +1,12 @@
 version: "3"
 
 services:
-        
+
   runtime-setup:
     image: async-http-client:20.04-main
     build:
       args:
         base_image: "swiftlang/swift:nightly-main-focal"
-        
 
   test:
     image: async-http-client:20.04-main