diff --git a/docker/docker-compose.2004.57.yaml b/docker/docker-compose.2004.57.yaml
index 94c5b5a0..e9357f10 100644
--- a/docker/docker-compose.2004.57.yaml
+++ b/docker/docker-compose.2004.57.yaml
@@ -6,7 +6,8 @@ services:
     image: swift-log:20.04-5.7
     build:
       args:
-        base_image: "swiftlang/swift:nightly-main-focal"
+        ubuntu_version: "focal"
+        swift_version: "5.7"
 
   test:
     image: swift-log:20.04-5.7
diff --git a/docker/docker-compose.2004.main.yaml b/docker/docker-compose.2004.58.yaml
similarity index 56%
rename from docker/docker-compose.2004.main.yaml
rename to docker/docker-compose.2004.58.yaml
index e73688eb..a4681f12 100644
--- a/docker/docker-compose.2004.main.yaml
+++ b/docker/docker-compose.2004.58.yaml
@@ -3,16 +3,16 @@ version: "3"
 services:
 
   runtime-setup:
-    image: swift-log:20.04-main
+    image: swift-log:20.04-5.8
     build:
       args:
-        base_image: "swiftlang/swift:nightly-main-focal"
+        base_image: "swiftlang/swift:nightly-5.8-focal"
 
   test:
-    image: swift-log:20.04-main
+    image: swift-log:20.04-5.8
     environment:
       - FORCE_TEST_DISCOVERY=--enable-test-discovery
       #- SANITIZER_ARG=--sanitize=thread
 
   shell:
-    image: swift-log:20.04-main
+    image: swift-log:20.04-5.8
diff --git a/docker/docker-compose.2204.main.yaml b/docker/docker-compose.2204.main.yaml
new file mode 100644
index 00000000..f428ad28
--- /dev/null
+++ b/docker/docker-compose.2204.main.yaml
@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-log:22.04-main
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-main-jammy"
+
+  test:
+    image: swift-log:22.04-main
+    environment:
+      - FORCE_TEST_DISCOVERY=--enable-test-discovery
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-log:22.04-main