diff --git a/Package.swift b/Package.swift
index 47db7f0d..cd039870 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.8
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the SwiftNIO open source project
diff --git a/README.md b/README.md
index 564ff8e2..7e80a064 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,8 @@ SwiftNIO HTTP/2     | Minimum Swift Version
 `1.21.0 ..< 1.23.0` | 5.4
 `1.24.0 ..< 1.27.0` | 5.5.2
 `1.27.0 ..< 1.29.0` | 5.6
-`1.29.0 ...`        | 5.7
+`1.29.0 ..< 1.31.0` | 5.7
+`1.31.0 ...`        | 5.8
 
 
 ### `swift-nio-http2` 0.x
diff --git a/docker/docker-compose.2204.510.yaml b/docker/docker-compose.2204.510.yaml
index 5682b2e7..052b31c6 100644
--- a/docker/docker-compose.2204.510.yaml
+++ b/docker/docker-compose.2204.510.yaml
@@ -6,7 +6,8 @@ services:
     image: swift-nio-http2:22.04-5.10
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.10-jammy"
+        ubuntu_version: "jammy"
+        swift_version: "5.10"
         h2spec_version: "2.2.1"
 
   unit-tests:
diff --git a/docker/docker-compose.2204.57.yaml b/docker/docker-compose.2204.57.yaml
deleted file mode 100644
index 5566ba24..00000000
--- a/docker/docker-compose.2204.57.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-version: "3"
-
-services:
-
-  runtime-setup:
-    image: swift-nio-http2:22.04-5.7
-    build:
-      args:
-        ubuntu_version: "jammy"
-        swift_version: "5.7"
-        h2spec_version: "2.2.1"
-
-  unit-tests:
-    image: swift-nio-http2:22.04-5.7
-
-  integration-tests:
-    image: swift-nio-http2:22.04-5.7
-
-  performance-test:
-    image: swift-nio-http2:22.04-5.7
-
-  h2spec:
-    image: swift-nio-http2:22.04-5.7
-
-  documentation-check:
-    image: swift-nio-http2:22.04-5.7
-
-  test:
-    image: swift-nio-http2:22.04-5.7
-    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=288050
-      - MAX_ALLOCS_ALLOWED_client_server_h1_request_response_inline=273050
-      - MAX_ALLOCS_ALLOWED_client_server_request_response=257050
-      - MAX_ALLOCS_ALLOWED_client_server_request_response_inline=248050
-      - MAX_ALLOCS_ALLOWED_client_server_request_response_many=1202050
-      - MAX_ALLOCS_ALLOWED_client_server_request_response_many_inline=893050
-      - 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=292650
-      - MAX_ALLOCS_ALLOWED_stream_teardown_100_concurrent_inline=291750
-
-  shell:
-    image: swift-nio-http2:22.04-5.7