diff --git a/.swiftformat b/.swiftformat
index 52322f8..1a2dcb1 100644
--- a/.swiftformat
+++ b/.swiftformat
@@ -1,6 +1,6 @@
 # file options
 
---swiftversion 5.2
+--swiftversion 5.4
 --exclude .build
 
 # format options
diff --git a/Package.swift b/Package.swift
index e7a4254..00a0e11 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 SwiftNIO open source project
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6f6d76e..b4c6703 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 9183086..0000000
--- a/docker/docker-compose.1604.52.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-version: "3"
-
-services:
-
-  runtime-setup:
-    image: swift-http-structured-headers:16.04-5.2
-    build:
-      args:
-        ubuntu_version: "xenial"
-        swift_version: "5.2"
-
-  unit-tests:
-    image: swift-http-structured-headers:16.04-5.2
-
-  test:
-    image: swift-http-structured-headers:16.04-5.2
-    environment:
-      - SANITIZER_ARG=--sanitize=thread
-
-  shell:
-    image: swift-http-structured-headers:16.04-5.2
diff --git a/docker/docker-compose.1804.53.yaml b/docker/docker-compose.1804.53.yaml
deleted file mode 100644
index e26d520..0000000
--- a/docker/docker-compose.1804.53.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: "3"
-
-services:
-
-  runtime-setup:
-    image: swift-http-structured-headers:18.04-5.3
-    build:
-      args:
-        ubuntu_version: "bionic"
-        swift_version: "5.3"
-
-  unit-tests:
-    image: swift-http-structured-headers:18.04-5.3
-
-  test:
-    image: swift-http-structured-headers:18.04-5.3
-
-  shell:
-    image: swift-http-structured-headers:18.04-5.3
-
diff --git a/docker/docker-compose.1804.54.yaml b/docker/docker-compose.1804.54.yaml
new file mode 100644
index 0000000..ccbca7f
--- /dev/null
+++ b/docker/docker-compose.1804.54.yaml
@@ -0,0 +1,20 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-http-structured-headers:18.04-5.4
+    build:
+      args:
+        ubuntu_version: "bionic"
+        swift_version: "5.4"
+
+  unit-tests:
+    image: swift-http-structured-headers:18.04-5.4
+
+  test:
+    image: swift-http-structured-headers:18.04-5.4
+
+  shell:
+    image: swift-http-structured-headers: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 b1f6c9d..0000000
--- a/docker/docker-compose.2004.54.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: "3"
-
-services:
-
-  runtime-setup:
-    image: swift-http-structured-headers:20.04-5.4
-    build:
-      args:
-        ubuntu_version: "focal"
-        swift_version: "5.4"
-
-  unit-tests:
-    image: swift-http-structured-headers:20.04-5.4
-
-  test:
-    image: swift-http-structured-headers:20.04-5.4
-
-  shell:
-    image: swift-http-structured-headers:20.04-5.4
-