diff --git a/docker/Dockerfile b/docker/Dockerfile
index 50d3033b..c2a1e8de 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,6 @@
 ARG swift_version=5.2
 # FIXME when 5.2 images are available
-#ARG base_image=swift:$swift_version-amazonlinux2
-ARG base_image=swiftlang/swift:nightly-amazonlinux2
+ARG base_image=swift:$swift_version-amazonlinux2
 FROM $base_image
 # needed to do again after FROM due to docker limitation
 ARG swift_version
diff --git a/docker/docker-compose.al2.52.yaml b/docker/docker-compose.al2.52.yaml
new file mode 100644
index 00000000..30f12089
--- /dev/null
+++ b/docker/docker-compose.al2.52.yaml
@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-aws-lambda:al2-5.2
+    build:
+      args:
+        swift_version: "5.2"
+
+  test:
+    image: swift-aws-lambda:al2-5.2
+
+  test-samples:
+    image: swift-aws-lambda:al2-5.2
+
+  shell:
+    image: swift-aws-lambda:al2-5.2
diff --git a/docker/docker-compose.1804.53.yaml b/docker/docker-compose.al2.53.yaml
similarity index 51%
rename from docker/docker-compose.1804.53.yaml
rename to docker/docker-compose.al2.53.yaml
index f59b9330..140bdeae 100644
--- a/docker/docker-compose.1804.53.yaml
+++ b/docker/docker-compose.al2.53.yaml
@@ -3,16 +3,16 @@ version: "3"
 services:
 
   runtime-setup:
-    image: swift-aws-lambda:18.04-5.3
+    image: swift-aws-lambda:al2-5.3
     build:
       args:
         base_image: "swiftlang/swift:nightly-amazonlinux2"
 
   test:
-    image: swift-aws-lambda:18.04-5.3
+    image: swift-aws-lambda:al2-5.3
 
   test-samples:
-    image: swift-aws-lambda:18.04-5.3
+    image: swift-aws-lambda:al2-5.3
 
   shell:
-    image: swift-aws-lambda:18.04-5.3
+    image: swift-aws-lambda:al2-5.3