diff --git a/docker/docker-compose.2004.main.yaml b/docker/docker-compose.2004.main.yaml
deleted file mode 100644
index 626b4af..0000000
--- a/docker/docker-compose.2004.main.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-version: "3"
-
-services:
-
-  runtime-setup:
-    image: swift-http-structured-headers:20.04-main
-    build:
-      args:
-        base_image: "swiftlang/swift:nightly-main-focal"
-        ubuntu_version: "focal"
-
-  unit-tests:
-    image: swift-http-structured-headers:20.04-main
-
-  test:
-    image: swift-http-structured-headers:20.04-main
-    environment:
-      - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
-
-  shell:
-    image: swift-http-structured-headers:20.04-main
-
diff --git a/docker/docker-compose.2204.58.yaml b/docker/docker-compose.2204.58.yaml
new file mode 100644
index 0000000..d9d8c62
--- /dev/null
+++ b/docker/docker-compose.2204.58.yaml
@@ -0,0 +1,22 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-http-structured-headers:22.04-5.8
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.8-jammy"
+        ubuntu_version: "jammy"
+
+  unit-tests:
+    image: swift-http-structured-headers:22.04-5.8
+
+  test:
+    image: swift-http-structured-headers:22.04-5.8
+    environment:
+      - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
+
+  shell:
+    image: swift-http-structured-headers:22.04-5.8
+
diff --git a/docker/docker-compose.2204.main.yaml b/docker/docker-compose.2204.main.yaml
new file mode 100644
index 0000000..25fcd5e
--- /dev/null
+++ b/docker/docker-compose.2204.main.yaml
@@ -0,0 +1,22 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-http-structured-headers:22.04-main
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-main-jammy"
+        ubuntu_version: "jammy"
+
+  unit-tests:
+    image: swift-http-structured-headers:22.04-main
+
+  test:
+    image: swift-http-structured-headers:22.04-main
+    environment:
+      - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
+
+  shell:
+    image: swift-http-structured-headers:22.04-main
+