diff --git a/Utilities/Docker/docker-compose.2004.57.yaml b/Utilities/Docker/docker-compose.2004.57.yaml
index 8ac94c03981..7f55faac8ba 100644
--- a/Utilities/Docker/docker-compose.2004.57.yaml
+++ b/Utilities/Docker/docker-compose.2004.57.yaml
@@ -16,7 +16,6 @@ services:
       args:
         ubuntu_version: "focal"
         swift_version: "5.7"
-        base_image: "swiftlang/swift:nightly-5.7-focal"
 
   build:
     image: swift-package-manager:20.04-5.7
diff --git a/Utilities/Docker/docker-compose.2204.58.yaml b/Utilities/Docker/docker-compose.2204.58.yaml
new file mode 100644
index 00000000000..66ff1727041
--- /dev/null
+++ b/Utilities/Docker/docker-compose.2204.58.yaml
@@ -0,0 +1,37 @@
+# This source file is part of the Swift open source project
+#
+# Copyright (c) 2023 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-package-manager:22.04-5.8
+    build:
+      args:
+        ubuntu_version: "jammy"
+        swift_version: "5.8"
+        base_image: "swiftlang/swift:nightly-5.8-jammy"
+
+  build:
+    image: swift-package-manager:22.04-5.8
+
+  test:
+    image: swift-package-manager:22.04-5.8
+
+  bootstrap-clean:
+    image: swift-package-manager:22.04-5.8
+
+  bootstrap-build:
+    image: swift-package-manager:22.04-5.8
+
+  bootstrap-test:
+    image: swift-package-manager:22.04-5.8
+
+  shell:
+    image: swift-package-manager:22.04-5.8
diff --git a/Utilities/Docker/docker-compose.2204.59.yaml b/Utilities/Docker/docker-compose.2204.59.yaml
new file mode 100644
index 00000000000..2ceaeaec579
--- /dev/null
+++ b/Utilities/Docker/docker-compose.2204.59.yaml
@@ -0,0 +1,37 @@
+# This source file is part of the Swift open source project
+#
+# Copyright (c) 2023 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-package-manager:22.04-5.9
+    build:
+      args:
+        ubuntu_version: "jammy"
+        swift_version: "5.9"
+        base_image: "swiftlang/swift:nightly-5.9-jammy"
+
+  build:
+    image: swift-package-manager:22.04-5.9
+
+  test:
+    image: swift-package-manager:22.04-5.9
+
+  bootstrap-clean:
+    image: swift-package-manager:22.04-5.9
+
+  bootstrap-build:
+    image: swift-package-manager:22.04-5.9
+
+  bootstrap-test:
+    image: swift-package-manager:22.04-5.9
+
+  shell:
+    image: swift-package-manager:22.04-5.9
diff --git a/Utilities/Docker/docker-compose.yaml b/Utilities/Docker/docker-compose.yaml
index 10881642a47..7a6a42fc539 100644
--- a/Utilities/Docker/docker-compose.yaml
+++ b/Utilities/Docker/docker-compose.yaml
@@ -8,7 +8,7 @@
 
 # this file is not designed to be run directly
 # instead, use the docker-compose.<os>.<swift> files
-# eg docker-compose -f Utilities/docker/docker-compose.yaml -f Utilities/docker/docker-compose.1804.52.yaml run test
+# eg docker-compose -f Utilities/docker/docker-compose.yaml -f Utilities/docker/docker-compose.2004.57.yaml run test
 version: "3"
 
 services: