diff --git a/docker/docker-compose.al2.58.yaml b/docker/docker-compose.al2.58.yaml
new file mode 100644
index 00000000..74154ab8
--- /dev/null
+++ b/docker/docker-compose.al2.58.yaml
@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-aws-lambda:al2-5.8
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.8-amazonlinux2"
+
+  test:
+    image: swift-aws-lambda:al2-5.8
+
+  test-samples:
+    image: swift-aws-lambda:al2-5.8
+
+  shell:
+    image: swift-aws-lambda:al2-5.8