diff --git a/dev-support/bin/dist-layout-stitching b/dev-support/bin/dist-layout-stitching
index 119ee602270..3fad33dfe02 100755
--- a/dev-support/bin/dist-layout-stitching
+++ b/dev-support/bin/dist-layout-stitching
@@ -149,6 +149,7 @@ run cp -p "${ROOT}/hadoop-client-modules/hadoop-client-minicluster/target/hadoop
 
 run copy "${ROOT}/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${VERSION}" .
 
+run cp -pr "${ROOT}/hadoop-dist/src/main/compose" .
 
 echo
 echo "Hadoop dist layout available at: ${BASEDIR}/hadoop-${VERSION}"
diff --git a/hadoop-dist/src/main/compose/hdfs/docker-compose.yaml b/hadoop-dist/src/main/compose/hdfs/docker-compose.yaml
new file mode 100644
index 00000000000..5b9afd998db
--- /dev/null
+++ b/hadoop-dist/src/main/compose/hdfs/docker-compose.yaml
@@ -0,0 +1,21 @@
+version: "2"
+services:
+  namenode:
+    image: apache/hadoop-runner:jdk8
+    hostname: namenode
+    volumes:
+      - ../..:/opt/hadoop
+    command: ["hdfs","namenode"]
+    ports:
+      - 9870:9870
+    env_file:
+      - ./docker-config
+    environment:
+      ENSURE_NAMENODE_DIR: "/tmp/hadoop-root/dfs/name"
+  datanode:
+    image: apache/hadoop-runner:jdk8
+    command: ["hdfs", "datanode"]
+    volumes:
+      - ../..:/opt/hadoop
+    env_file:
+      - ./docker-config
\ No newline at end of file
diff --git a/hadoop-dist/src/main/compose/hdfs/docker-config b/hadoop-dist/src/main/compose/hdfs/docker-config
new file mode 100644
index 00000000000..6821ebd3022
--- /dev/null
+++ b/hadoop-dist/src/main/compose/hdfs/docker-config
@@ -0,0 +1,2 @@
+CORE-SITE.XML_fs.defaultFS=hdfs://namenode:8020
+HDFS-SITE.XML_dfs.replication=1
\ No newline at end of file