diff --git a/docker/docker-compose.2004.56.yaml b/docker/docker-compose.2004.56.yaml
index 8eb2807..fe21b9f 100644
--- a/docker/docker-compose.2004.56.yaml
+++ b/docker/docker-compose.2004.56.yaml
@@ -6,8 +6,8 @@ services:
     image: swift-http-structured-headers:20.04-5.6
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.6-focal"
         ubuntu_version: "focal"
+        swift_version: "5.6"
 
   unit-tests:
     image: swift-http-structured-headers: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 0000000..de99e30
--- /dev/null
+++ b/docker/docker-compose.2004.57.yaml
@@ -0,0 +1,19 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-http-structured-headers:20.04-5.7
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-main-focal"
+
+  unit-tests:
+    image: swift-http-structured-headers:20.04-5.7
+
+  test:
+    image: swift-http-structured-headers:20.04-5.7
+
+  shell:
+    image: swift-http-structured-headers:20.04-5.7
+