diff --git a/docker/docker-compose.2004.57.yaml b/docker/docker-compose.2004.57.yaml
index 52aec98..fb6740a 100644
--- a/docker/docker-compose.2004.57.yaml
+++ b/docker/docker-compose.2004.57.yaml
@@ -6,7 +6,8 @@ services:
     image: swift-cassandra-client:20.04-5.7
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.7-focal"
+        ubuntu_version: "focal"
+        swift_version: "5.7"
 
   build:
     image: swift-cassandra-client:20.04-5.7
diff --git a/docker/docker-compose.2004.main.yaml b/docker/docker-compose.2004.58.yaml
similarity index 51%
rename from docker/docker-compose.2004.main.yaml
rename to docker/docker-compose.2004.58.yaml
index d302360..c4667de 100644
--- a/docker/docker-compose.2004.main.yaml
+++ b/docker/docker-compose.2004.58.yaml
@@ -3,19 +3,19 @@ version: "3"
 services:
 
   runtime-setup:
-    image: swift-cassandra-client:20.04-main
+    image: swift-cassandra-client:20.04-5.8
     build:
       args:
-        base_image: "swiftlang/swift:nightly-main-focal"
+        base_image: "swiftlang/swift:nightly-5.8-focal"
 
   build:
-    image: swift-cassandra-client:20.04-main
+    image: swift-cassandra-client:20.04-5.8
 
   test:
-    image: swift-cassandra-client:20.04-main
+    image: swift-cassandra-client:20.04-5.8
     environment: []
       #- SANITIZER_ARG: "--sanitize=thread"
       #- TSAN_OPTIONS: "no_huge_pages_for_shadow=0 suppressions=/code/tsan_suppressions.txt"
 
   shell:
-    image: swift-cassandra-client:20.04-main
+    image: swift-cassandra-client: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 0000000..1037dc8
--- /dev/null
+++ b/docker/docker-compose.2204.main.yaml
@@ -0,0 +1,21 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-cassandra-client:22.04-main
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-main-jammy"
+
+  build:
+    image: swift-cassandra-client:22.04-main
+
+  test:
+    image: swift-cassandra-client:22.04-main
+    environment: []
+      #- SANITIZER_ARG: "--sanitize=thread"
+      #- TSAN_OPTIONS: "no_huge_pages_for_shadow=0 suppressions=/code/tsan_suppressions.txt"
+
+  shell:
+    image: swift-cassandra-client:22.04-main