diff --git a/Tests/AsyncHTTPClientTests/AsyncAwaitEndToEndTests.swift b/Tests/AsyncHTTPClientTests/AsyncAwaitEndToEndTests.swift
index 9a77ee9fb..97c802319 100644
--- a/Tests/AsyncHTTPClientTests/AsyncAwaitEndToEndTests.swift
+++ b/Tests/AsyncHTTPClientTests/AsyncAwaitEndToEndTests.swift
@@ -416,9 +416,9 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
                 XCTAssertNoThrow(try serverChannel.close().wait())
             }
             let port = serverChannel.localAddress!.port!
-            let firstClientChannel = try ClientBootstrap(group: self.serverGroup)
+            let firstClientChannel = try await ClientBootstrap(group: self.serverGroup)
                 .connect(host: "127.0.0.1", port: port)
-                .wait()
+                .get()
             defer {
                 XCTAssertNoThrow(try firstClientChannel.close().wait())
             }
@@ -464,7 +464,7 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
                 .childChannelInitializer { channel in
                     channel.pipeline.addHandler(NIOSSLServerHandler(context: sslContext))
                 }
-            let serverChannel = try server.bind(host: "localhost", port: 0).wait()
+            let serverChannel = try await server.bind(host: "localhost", port: 0).get()
             defer { XCTAssertNoThrow(try serverChannel.close().wait()) }
             let port = serverChannel.localAddress!.port!
 
diff --git a/docker/docker-compose.2004.main.yaml b/docker/docker-compose.2204.58.yaml
similarity index 54%
rename from docker/docker-compose.2004.main.yaml
rename to docker/docker-compose.2204.58.yaml
index d6f04b917..d5dc8432e 100644
--- a/docker/docker-compose.2004.main.yaml
+++ b/docker/docker-compose.2204.58.yaml
@@ -3,16 +3,16 @@ version: "3"
 services:
 
   runtime-setup:
-    image: async-http-client:20.04-main
+    image: async-http-client:22.04-5.8
     build:
       args:
-        base_image: "swiftlang/swift:nightly-main-focal"
+        base_image: "swiftlang/swift:nightly-5.8-jammy"
 
   test:
-    image: async-http-client:20.04-main
+    image: async-http-client:22.04-5.8
     environment:
       - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
       #- SANITIZER_ARG=--sanitize=thread
 
   shell:
-    image: async-http-client:20.04-main
+    image: async-http-client:22.04-5.8
diff --git a/docker/docker-compose.2204.main.yaml b/docker/docker-compose.2204.main.yaml
new file mode 100644
index 000000000..9132ed322
--- /dev/null
+++ b/docker/docker-compose.2204.main.yaml
@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: async-http-client:22.04-main
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-main-jammy"
+
+  test:
+    image: async-http-client:22.04-main
+    environment:
+      - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: async-http-client:22.04-main