diff --git a/docker/docker-compose.2204.510.yaml b/docker/docker-compose.2204.510.yaml
new file mode 100644
index 00000000..be270f0b
--- /dev/null
+++ b/docker/docker-compose.2204.510.yaml
@@ -0,0 +1,23 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-kafka-client:22.04-5.10
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.10-jammy"
+
+  build:
+    image: swift-kafka-client:22.04-5.10
+
+  test:
+    image: swift-kafka-client:22.04-5.10
+    environment:
+      - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors
+      - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
+      - STRICT_CONCURRENCY_ARG=-Xswiftc -strict-concurrency=complete
+      # - SANITIZER_ARG=--sanitize=thread # TSan broken still
+
+  shell:
+    image: swift-kafka-client:22.04-5.10
diff --git a/docker/docker-compose.2204.59.yaml b/docker/docker-compose.2204.59.yaml
index 82532d55..f238c9d3 100644
--- a/docker/docker-compose.2204.59.yaml
+++ b/docker/docker-compose.2204.59.yaml
@@ -6,7 +6,8 @@ services:
     image: swift-kafka-client:22.04-5.9
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.9-jammy"
+        ubuntu_version: "jammy"
+        swift_version: "5.9"
 
   build:
     image: swift-kafka-client:22.04-5.9