diff --git a/docker/docker-compose.2004.57.yaml b/docker/docker-compose.2004.57.yaml
index dcd1f85..3bf40ff 100644
--- a/docker/docker-compose.2004.57.yaml
+++ b/docker/docker-compose.2004.57.yaml
@@ -6,7 +6,8 @@ services:
     image: swift-distributed-tracing:20.04-5.7
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.7-focal"
+        ubuntu_version: "focal"
+        swift_version: "5.7"
 
   test:
     image: swift-distributed-tracing:20.04-5.7
diff --git a/docker/docker-compose.2004.58.yaml b/docker/docker-compose.2004.58.yaml
new file mode 100644
index 0000000..dcde4f7
--- /dev/null
+++ b/docker/docker-compose.2004.58.yaml
@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-distributed-tracing:20.04-5.8
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.8-focal"
+
+  test:
+    image: swift-distributed-tracing:20.04-5.8
+    environment:
+      - FORCE_TEST_DISCOVERY=--enable-test-discovery
+
+  shell:
+    image: swift-distributed-tracing:20.04-5.8
diff --git a/docker/docker-compose.2004.main.yaml b/docker/docker-compose.2004.main.yaml
deleted file mode 100644
index 4ba3202..0000000
--- a/docker/docker-compose.2004.main.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: "3"
-
-services:
-
-  runtime-setup:
-    image: swift-distributed-tracing:20.04-main
-    build:
-      args:
-        base_image: "swiftlang/swift:nightly-main-focal"
-
-  test:
-    image: swift-distributed-tracing:20.04-main
-    environment:
-      - FORCE_TEST_DISCOVERY=--enable-test-discovery
-
-  shell:
-    image: swift-distributed-tracing:20.04-main
diff --git a/docker/docker-compose.2204.main.yaml b/docker/docker-compose.2204.main.yaml
new file mode 100644
index 0000000..f67b0dd
--- /dev/null
+++ b/docker/docker-compose.2204.main.yaml
@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-distributed-tracing:22.04-main
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-main-jammy"
+
+  test:
+    image: swift-distributed-tracing:22.04-main
+    environment:
+      - FORCE_TEST_DISCOVERY=--enable-test-discovery
+
+  shell:
+    image: swift-distributed-tracing:22.04-main