diff --git a/Package.swift b/Package.swift
index 2b12d3e..3f48e55 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 74a3f60..1d1aa55 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,8 @@ SwiftNIO Extras     | Minimum Swift Version
 `1.12.0 ..< 1.15.0` | 5.4
 `1.15.0 ..< 1.17.0` | 5.5.2
 `1.17.0 ..< 1.19.0` | 5.6
-`1.19.0 ...`        | 5.7
+`1.19.0 ..< 1.21.0` | 5.7
+`1.21.0 ...`        | 5.8
 
 ### `swift-nio-transport-services ` 0.x
 
diff --git a/Sources/NIOTransportServices/Docs.docc/index.md b/Sources/NIOTransportServices/Docs.docc/index.md
index e45c6f9..de7244b 100644
--- a/Sources/NIOTransportServices/Docs.docc/index.md
+++ b/Sources/NIOTransportServices/Docs.docc/index.md
@@ -65,7 +65,8 @@ SwiftNIO Extras     | Minimum Swift Version
 `1.12.0 ..< 1.14.0` | 5.4
 `1.15.0 ..< 1.17.0` | 5.5.2
 `1.17.0 ..< 1.19.0` | 5.6
-`1.19.0 ...`        | 5.7
+`1.19.0 ..< 1.21.0` | 5.7
+`1.21.0 ...`        | 5.8
 
 #### NIO Transport Services 0.x
 
diff --git a/docker/docker-compose.2204.510.yaml b/docker/docker-compose.2204.510.yaml
index e41fbe8..38af927 100644
--- a/docker/docker-compose.2204.510.yaml
+++ b/docker/docker-compose.2204.510.yaml
@@ -7,7 +7,7 @@ services:
     build:
       args:
         ubuntu_version: "jammy"
-        base_image: "swiftlang/swift:nightly-5.10-jammy"
+        swift_version: "5.10"
 
   documentation-check:
     image: swift-nio-transport-services:22.04-5.10
diff --git a/docker/docker-compose.2204.57.yaml b/docker/docker-compose.2204.57.yaml
deleted file mode 100644
index 0a1f9a4..0000000
--- a/docker/docker-compose.2204.57.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "3"
-
-services:
-
-  runtime-setup:
-    image: swift-nio-transport-services:22.04-5.7
-    build:
-      args:
-        ubuntu_version: "jammy"
-        swift_version: "5.7"
-
-  documentation-check:
-    image: swift-nio-transport-services:22.04-5.7
-
-  test:
-    image: swift-nio-transport-services:22.04-5.7
-
-  shell:
-    image: swift-nio-transport-services:22.04-5.7