diff --git a/docker/docker-compose.2204.510.yaml b/docker/docker-compose.2204.510.yaml
new file mode 100644
index 00000000..32c12c97
--- /dev/null
+++ b/docker/docker-compose.2204.510.yaml
@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-distributed-tracing:22.04-5.10
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.10-jammy"
+
+  test:
+    image: swift-distributed-tracing:22.04-5.10
+    environment:
+      - FORCE_TEST_DISCOVERY=--enable-test-discovery
+      # - STRICT_CONCURRENCY_ARG=-Xswiftc -strict-concurrency=complete
+
+  shell:
+    image: swift-distributed-tracing:22.04-5.10
diff --git a/docker/docker-compose.2204.59.yaml b/docker/docker-compose.2204.59.yaml
index 2da890c2..8442234c 100644
--- a/docker/docker-compose.2204.59.yaml
+++ b/docker/docker-compose.2204.59.yaml
@@ -6,7 +6,8 @@ services:
     image: swift-distributed-tracing:22.04-5.9
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.9-jammy"
+        ubuntu_version: "jammy"
+        swift_version: "5.9"
 
   test:
     image: swift-distributed-tracing:22.04-5.9