diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
index 1ccbbce84d..7b885c95be 100644
--- a/hadoop-dist/pom.xml
+++ b/hadoop-dist/pom.xml
@@ -140,6 +140,43 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-docker-compose</id>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <phase>prepare-package</phase>
+            <configuration>
+              <outputDirectory>${project.build.directory}/compose</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>src/main/compose</directory>
+                  <filtering>true</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-dockerfile</id>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <phase>prepare-package</phase>
+            <configuration>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>src/main/docker</directory>
+                  <filtering>true</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/dev-support/compose/cblock/.env b/hadoop-dist/src/main/compose/cblock/.env
similarity index 96%
rename from dev-support/compose/cblock/.env
rename to hadoop-dist/src/main/compose/cblock/.env
index f7ca18b5d8..af20d3e349 100644
--- a/dev-support/compose/cblock/.env
+++ b/hadoop-dist/src/main/compose/cblock/.env
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION=3.1.0-SNAPSHOT
+VERSION=${project.version}
\ No newline at end of file
diff --git a/dev-support/compose/cblock/README.md b/hadoop-dist/src/main/compose/cblock/README.md
similarity index 100%
rename from dev-support/compose/cblock/README.md
rename to hadoop-dist/src/main/compose/cblock/README.md
diff --git a/dev-support/compose/cblock/docker-compose.yaml b/hadoop-dist/src/main/compose/cblock/docker-compose.yaml
similarity index 84%
rename from dev-support/compose/cblock/docker-compose.yaml
rename to hadoop-dist/src/main/compose/cblock/docker-compose.yaml
index 4931a4bb3e..fefb37fd7d 100644
--- a/dev-support/compose/cblock/docker-compose.yaml
+++ b/hadoop-dist/src/main/compose/cblock/docker-compose.yaml
@@ -20,7 +20,7 @@ services:
       image: elek/hadoop-runner:latest
       hostname: namenode
       volumes:
-         - ../../../hadoop-dist/target/hadoop-${VERSION}:/opt/hadoop
+         - ../..//hadoop-${VERSION}:/opt/hadoop
       ports:
          - 9870:9870
       environment:
@@ -31,7 +31,7 @@ services:
    datanode:
       image: elek/hadoop-runner:latest
       volumes:
-        - ../../../hadoop-dist/target/hadoop-${VERSION}:/opt/hadoop
+        - ../..//hadoop-${VERSION}:/opt/hadoop
       ports:
         - 9864
       command: ["/opt/hadoop/bin/hdfs","datanode"]
@@ -40,21 +40,21 @@ services:
       ports:
         - 3260:3260
       volumes:
-         - ../../../hadoop-dist/target/hadoop-${VERSION}:/opt/hadoop
+         - ../..//hadoop-${VERSION}:/opt/hadoop
       env_file:
           - ./docker-config
       command: ["/opt/hadoop/bin/hdfs","jscsi"]
    cblock:
       image: elek/hadoop-runner:latest
       volumes:
-         - ../../../hadoop-dist/target/hadoop-${VERSION}:/opt/hadoop
+         - ../..//hadoop-${VERSION}:/opt/hadoop
       env_file:
           - ./docker-config
       command: ["/opt/hadoop/bin/hdfs","cblockserver"]
    scm:
       image: elek/hadoop-runner:latest
       volumes:
-         - ../../../hadoop-dist/target/hadoop-${VERSION}:/opt/hadoop
+         - ../..//hadoop-${VERSION}:/opt/hadoop
       ports:
          - 9876:9876
       env_file:
diff --git a/dev-support/compose/cblock/docker-config b/hadoop-dist/src/main/compose/cblock/docker-config
similarity index 100%
rename from dev-support/compose/cblock/docker-config
rename to hadoop-dist/src/main/compose/cblock/docker-config
diff --git a/dev-support/compose/ozone/.env b/hadoop-dist/src/main/compose/ozone/.env
similarity index 96%
rename from dev-support/compose/ozone/.env
rename to hadoop-dist/src/main/compose/ozone/.env
index f7ca18b5d8..af20d3e349 100644
--- a/dev-support/compose/ozone/.env
+++ b/hadoop-dist/src/main/compose/ozone/.env
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION=3.1.0-SNAPSHOT
+VERSION=${project.version}
\ No newline at end of file
diff --git a/dev-support/compose/ozone/docker-compose.yaml b/hadoop-dist/src/main/compose/ozone/docker-compose.yaml
similarity index 85%
rename from dev-support/compose/ozone/docker-compose.yaml
rename to hadoop-dist/src/main/compose/ozone/docker-compose.yaml
index ee5e0bc042..02713c7568 100644
--- a/dev-support/compose/ozone/docker-compose.yaml
+++ b/hadoop-dist/src/main/compose/ozone/docker-compose.yaml
@@ -20,9 +20,8 @@ services:
       image: elek/hadoop-runner:latest
       hostname: namenode
       volumes:
-         - ../../../hadoop-dist/target/hadoop-${VERSION}:/opt/hadoop
+         - ../..//hadoop-${VERSION}:/opt/hadoop
       ports:
-         - 50070:50070
          - 9870:9870
       environment:
           ENSURE_NAMENODE_DIR: /data/namenode
@@ -32,14 +31,14 @@ services:
    datanode:
       image: elek/hadoop-runner:latest
       volumes:
-        - ../../../hadoop-dist/target/hadoop-${VERSION}:/opt/hadoop
+        - ../..//hadoop-${VERSION}:/opt/hadoop
       ports:
         - 9864
       command: ["/opt/hadoop/bin/hdfs","datanode"]
    ksm:
       image: elek/hadoop-runner:latest
       volumes:
-         - ../../../hadoop-dist/target/hadoop-${VERSION}:/opt/hadoop
+         - ../..//hadoop-${VERSION}:/opt/hadoop
       ports:
          - 9874:9874
       environment:
@@ -50,7 +49,7 @@ services:
    scm:
       image: elek/hadoop-runner:latest
       volumes:
-         - ../../../hadoop-dist/target/hadoop-${VERSION}:/opt/hadoop
+         - ../..//hadoop-${VERSION}:/opt/hadoop
       ports:
          - 9876:9876
       env_file:
diff --git a/dev-support/compose/ozone/docker-config b/hadoop-dist/src/main/compose/ozone/docker-config
similarity index 100%
rename from dev-support/compose/ozone/docker-config
rename to hadoop-dist/src/main/compose/ozone/docker-config