diff --git a/docker/docker-compose.2004.58.yaml b/docker/docker-compose.2004.58.yaml
index 67c1a5f..07bfd51 100644
--- a/docker/docker-compose.2004.58.yaml
+++ b/docker/docker-compose.2004.58.yaml
@@ -6,7 +6,8 @@ services:
     image: swift-metrics:20.04-5.8
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.8-focal"
+        ubuntu_version: "focal"
+        swift_version: "5.8"
 
   test:
     image: swift-metrics:20.04-5.8
diff --git a/docker/docker-compose.2204.59.yaml b/docker/docker-compose.2204.59.yaml
new file mode 100644
index 0000000..ec9e0bc
--- /dev/null
+++ b/docker/docker-compose.2204.59.yaml
@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-metrics:22.04-5.9
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.9-jammy"
+
+  test:
+    image: swift-metrics:22.04-5.9
+    environment: []
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-metrics:22.04-5.9