diff --git a/docker/docker-compose.1804.55.yaml b/docker/docker-compose.1804.55.yaml
index 78519b3b..70d8c477 100644
--- a/docker/docker-compose.1804.55.yaml
+++ b/docker/docker-compose.1804.55.yaml
@@ -6,7 +6,8 @@ services:
     image: swift-distributed-tracing:18.04-5.5
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.5-bionic"
+        ubuntu_version: "bionic"
+        swift_version: "5.5"
 
   test:
     image: swift-distributed-tracing:18.04-5.5
diff --git a/docker/docker-compose.2004.56.yaml b/docker/docker-compose.2004.56.yaml
new file mode 100644
index 00000000..eac45f17
--- /dev/null
+++ b/docker/docker-compose.2004.56.yaml
@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-distributed-tracing:20.04-5.6
+    build:
+      args:
+        ubuntu_version: "focal"
+        swift_version: "5.6"
+
+  test:
+    image: swift-distributed-tracing:20.04-5.6
+    environment: []
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-distributed-tracing:20.04-5.6
diff --git a/docker/docker-compose.2004.57.yaml b/docker/docker-compose.2004.57.yaml
new file mode 100644
index 00000000..26bea451
--- /dev/null
+++ b/docker/docker-compose.2004.57.yaml
@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-distributed-tracing:20.04-5.7
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.7-focal"
+
+  test:
+    image: swift-distributed-tracing:20.04-5.7
+    environment: []
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-distributed-tracing:20.04-5.7
diff --git a/docker/docker-compose.2004.main.yaml b/docker/docker-compose.2004.main.yaml
new file mode 100644
index 00000000..e85334fc
--- /dev/null
+++ b/docker/docker-compose.2004.main.yaml
@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-distributed-tracing:20.04-main
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-main-focal"
+
+  test:
+    image: swift-distributed-tracing:20.04-main
+    environment: []
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-distributed-tracing:20.04-main