diff --git a/.swiftformat b/.swiftformat
index dac9cd4d3..c26e226e3 100644
--- a/.swiftformat
+++ b/.swiftformat
@@ -1,6 +1,6 @@
 # file options
 
---swiftversion 5.2
+--swiftversion 5.4
 --exclude .build
 
 # format options
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6382fcd4d..3803bb618 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -57,7 +57,7 @@ A good AsyncHTTPClient patch is:
 3. Documented, adding API documentation as needed to cover new functions and properties.
 4. Accompanied by a great commit message, using our commit message template.
 
-*Note* as of version 1.5.0 AsyncHTTPClient requires Swift 5.2. Earlier versions support as far back as Swift 5.0.
+*Note* as of version 1.10.0 AsyncHTTPClient requires Swift 5.4. Earlier versions support as far back as Swift 5.0.
 
 ### Commit Message Template
 
diff --git a/Package.swift b/Package.swift
index e4dcc717c..5deb0de31 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.4
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the AsyncHTTPClient open source project
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6395405c1..1cd4f2140 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG swift_version=5.2
+ARG swift_version=5.4
 ARG ubuntu_version=bionic
 ARG base_image=swift:$swift_version-$ubuntu_version
 FROM $base_image
diff --git a/docker/docker-compose.1604.52.yaml b/docker/docker-compose.1604.52.yaml
deleted file mode 100644
index 4f74bca9f..000000000
--- a/docker/docker-compose.1604.52.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3"
-
-services:
-
-  runtime-setup:
-    image: async-http-client:16.04-5.2
-    build:
-      args:
-        ubuntu_version: "xenial"
-        swift_version: "5.2"
-
-  test:
-    image: async-http-client:16.04-5.2
-    environment:
-      - SANITIZER_ARG=--sanitize=thread
-
-  shell:
-    image: async-http-client:16.04-5.2
diff --git a/docker/docker-compose.1804.53.yaml b/docker/docker-compose.1804.54.yaml
similarity index 54%
rename from docker/docker-compose.1804.53.yaml
rename to docker/docker-compose.1804.54.yaml
index e9e4e53dc..660429851 100644
--- a/docker/docker-compose.1804.53.yaml
+++ b/docker/docker-compose.1804.54.yaml
@@ -3,16 +3,16 @@ version: "3"
 services:
 
   runtime-setup:
-    image: async-http-client:18.04-5.3
+    image: async-http-client:18.04-5.4
     build:
       args:
         ubuntu_version: "bionic"
-        swift_version: "5.3"
+        swift_version: "5.4"
 
   test:
-    image: async-http-client:18.04-5.3
+    image: async-http-client:18.04-5.4
     environment: []
       #- SANITIZER_ARG=--sanitize=thread
 
   shell:
-    image: async-http-client:18.04-5.3
+    image: async-http-client:18.04-5.4
diff --git a/docker/docker-compose.2004.54.yaml b/docker/docker-compose.2004.54.yaml
deleted file mode 100644
index 154540ccb..000000000
--- a/docker/docker-compose.2004.54.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3"
-
-services:
-
-  runtime-setup:
-    image: async-http-client:20.04-5.4
-    build:
-      args:
-        ubuntu_version: "focal"
-        swift_version: "5.4"
-
-  test:
-    image: async-http-client:20.04-5.4
-    environment: []
-      #- SANITIZER_ARG=--sanitize=thread
-
-  shell:
-    image: async-http-client:20.04-5.4
diff --git a/scripts/check_no_api_breakages.sh b/scripts/check_no_api_breakages.sh
index 0fa3d4fb3..2d7028617 100755
--- a/scripts/check_no_api_breakages.sh
+++ b/scripts/check_no_api_breakages.sh
@@ -3,7 +3,7 @@
 ##
 ## This source file is part of the AsyncHTTPClient open source project
 ##
-## Copyright (c) 2018-2019 Apple Inc. and the AsyncHTTPClient project authors
+## Copyright (c) 2018-2022 Apple Inc. and the AsyncHTTPClient project authors
 ## Licensed under Apache License v2.0
 ##
 ## See LICENSE.txt for license information
@@ -32,12 +32,12 @@ set -eu
 function usage() {
     echo >&2 "Usage: $0 REPO-GITHUB-URL NEW-VERSION OLD-VERSIONS..."
     echo >&2
-    echo >&2 "This script requires a Swift 5.2+ toolchain."
+    echo >&2 "This script requires a Swift 5.6+ toolchain."
     echo >&2
     echo >&2 "Examples:"
     echo >&2
-    echo >&2 "Check between main and tag 2.1.1 of swift-nio:"
-    echo >&2 "  $0 https://github.com/apple/swift-nio main 2.1.1"
+    echo >&2 "Check between main and tag 1.9.0 of async-http-client:"
+    echo >&2 "  $0 https://github.com/swift-server/async-http-client main 1.9.0"
     echo >&2
     echo >&2 "Check between HEAD and commit 64cf63d7 using the provided toolchain:"
     echo >&2 "  xcrun --toolchain org.swift.5120190702a $0 ../some-local-repo HEAD 64cf63d7"