diff --git a/docker/Dockerfile b/docker/Dockerfile
index c769b77e..818eae2c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,7 @@
 ARG swift_version=5.0
 ARG ubuntu_version=bionic
-FROM swift:$swift_version-$ubuntu_version
+ARG base_image=swift:$swift_version-$ubuntu_version
+FROM $base_image
 # needed to do again after FROM due to docker limitation
 ARG swift_version
 ARG ubuntu_version
diff --git a/docker/docker-compose.1804.52.yaml b/docker/docker-compose.1804.52.yaml
new file mode 100644
index 00000000..33ec2295
--- /dev/null
+++ b/docker/docker-compose.1804.52.yaml
@@ -0,0 +1,15 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-aws-lambda:18.04-5.2
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.2-bionic"
+
+  test:
+    image: swift-aws-lambda:18.04-5.2
+
+  shell:
+    image: swift-aws-lambda:18.04-5.2