diff --git a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
index cb6312d8b7..612ee541ac 100755
--- a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
+++ b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
@@ -78,7 +78,9 @@ run mkdir -p ./etc
 run mkdir -p ./libexec
 
 run cp -r "${ROOT}/hadoop-common-project/hadoop-common/src/main/conf" "etc/hadoop"
-run cp "${ROOT}/hadoop-ozone/common/src/main/conf/om-audit-log4j2.properties" "etc/hadoop"
+run cp "${ROOT}/hadoop-ozone/dist/src/main/conf/om-audit-log4j2.properties" "etc/hadoop"
+run cp "${ROOT}/hadoop-ozone/dist/src/main/conf/ozone-site.xml" "etc/hadoop"
+run cp -f "${ROOT}/hadoop-ozone/dist/src/main/conf/log4j.properties" "etc/hadoop"
 run cp "${ROOT}/hadoop-common-project/hadoop-common/src/main/bin/hadoop" "bin/"
 run cp "${ROOT}/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd" "bin/"
 run cp "${ROOT}/hadoop-ozone/common/src/main/bin/ozone" "bin/"
diff --git a/hadoop-hdds/common/src/main/conf/log4j.properties b/hadoop-ozone/dist/src/main/conf/log4j.properties
similarity index 100%
rename from hadoop-hdds/common/src/main/conf/log4j.properties
rename to hadoop-ozone/dist/src/main/conf/log4j.properties
diff --git a/hadoop-ozone/common/src/main/conf/om-audit-log4j2.properties b/hadoop-ozone/dist/src/main/conf/om-audit-log4j2.properties
similarity index 100%
rename from hadoop-ozone/common/src/main/conf/om-audit-log4j2.properties
rename to hadoop-ozone/dist/src/main/conf/om-audit-log4j2.properties
diff --git a/hadoop-ozone/common/src/main/conf/ozone-site.xml b/hadoop-ozone/dist/src/main/conf/ozone-site.xml
similarity index 100%
rename from hadoop-ozone/common/src/main/conf/ozone-site.xml
rename to hadoop-ozone/dist/src/main/conf/ozone-site.xml