diff --git a/docker/docker-compose.al2.58.yaml b/docker/docker-compose.al2.58.yaml
index 8f7790f..530a30e 100644
--- a/docker/docker-compose.al2.58.yaml
+++ b/docker/docker-compose.al2.58.yaml
@@ -6,7 +6,7 @@ services:
     image: swift-aws-lambda-events:al2-5.8
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.8-amazonlinux2"
+        swift_version: "5.8"
 
   test:
     image: swift-aws-lambda-events:al2-5.8
diff --git a/docker/docker-compose.al2.59.yaml b/docker/docker-compose.al2.59.yaml
new file mode 100644
index 0000000..0298cd0
--- /dev/null
+++ b/docker/docker-compose.al2.59.yaml
@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-aws-lambda-events:al2-5.9
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.9-amazonlinux2"
+
+  test:
+    image: swift-aws-lambda-events:al2-5.9
+
+  test-samples:
+    image: swift-aws-lambda-events:al2-5.9
+
+  shell:
+    image: swift-aws-lambda-events:al2-5.9