diff --git a/docker/docker-compose.2204.58.yaml b/docker/docker-compose.2204.58.yaml
index df82689b..963eec64 100644
--- a/docker/docker-compose.2204.58.yaml
+++ b/docker/docker-compose.2204.58.yaml
@@ -6,7 +6,8 @@ services:
     image: swift-nio-http2:22.04-5.8
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.8-jammy"
+        ubuntu_version: "jammy"
+        swift_version: "5.8"
         h2spec_version: "2.2.1"
 
   unit-tests:
diff --git a/docker/docker-compose.2204.59.yaml b/docker/docker-compose.2204.59.yaml
new file mode 100644
index 00000000..f49c8d84
--- /dev/null
+++ b/docker/docker-compose.2204.59.yaml
@@ -0,0 +1,52 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-nio-http2:22.04-5.9
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.9-jammy"
+        h2spec_version: "2.2.1"
+
+  unit-tests:
+    image: swift-nio-http2:22.04-5.9
+
+  integration-tests:
+    image: swift-nio-http2:22.04-5.9
+
+  performance-test:
+    image: swift-nio-http2:22.04-5.9
+
+  h2spec:
+    image: swift-nio-http2:22.04-5.9
+
+  documentation-check:
+    image: swift-nio-http2:22.04-5.9
+
+  test:
+    image: swift-nio-http2:22.04-5.9
+    environment:
+      - MAX_ALLOCS_ALLOWED_1k_requests_inline_interleaved=35150
+      - MAX_ALLOCS_ALLOWED_1k_requests_inline_noninterleaved=34100
+      - MAX_ALLOCS_ALLOWED_1k_requests_interleaved=41150
+      - MAX_ALLOCS_ALLOWED_1k_requests_noninterleaved=40100
+      - MAX_ALLOCS_ALLOWED_client_server_h1_request_response=292050
+      - MAX_ALLOCS_ALLOWED_client_server_h1_request_response_inline=281050
+      - MAX_ALLOCS_ALLOWED_client_server_request_response=261050
+      - MAX_ALLOCS_ALLOWED_client_server_request_response_inline=256050
+      - MAX_ALLOCS_ALLOWED_client_server_request_response_many=1206050
+      - MAX_ALLOCS_ALLOWED_client_server_request_response_many_inline=901050
+      - MAX_ALLOCS_ALLOWED_create_client_stream_channel=39050
+      - MAX_ALLOCS_ALLOWED_create_client_stream_channel_inline=39050
+      - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form=200050
+      - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace=200050
+      - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace_from_long_string=300050
+      - MAX_ALLOCS_ALLOWED_get_100000_headers_canonical_form_trimming_whitespace_from_short_string=200050
+      - MAX_ALLOCS_ALLOWED_hpack_decoding=5050
+      - MAX_ALLOCS_ALLOWED_stream_teardown_100_concurrent=292850
+      - MAX_ALLOCS_ALLOWED_stream_teardown_100_concurrent_inline=292150
+      - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
+
+  shell:
+    image: swift-nio-http2:22.04-5.9