diff --git a/docker-compose.base.yml b/docker-compose.base.yml
index 7c5f901f07aa744836366c319adda2dc0bb2ae40..d8cee61e7b921cd718fc1451e43b666799f372b1 100644
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   os-node:
     image: opensearchproject/opensearch:2
@@ -25,10 +23,11 @@ services:
       - os-node-1:/usr/share/opensearch/data
       # NOTE: We map every file separately so that we don't overwrite the files created
       # in the same directory from opensearch.
-      - ./opensearch/security/internal_users.template.yml:/usr/share/opensearch/config/internal_users.template.yml:ro
-      - ./opensearch/security/tenants.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/tenants.yml:ro
-      - ./opensearch/opensearch.yml:/usr/share/opensearch/config/opensearch.yml:ro
-      - ./opensearch/init-security.sh:/usr/share/opensearch/init-security.sh:ro
+      - ./docker/opensearch/security/internal_users.template.yml:/usr/share/opensearch/config/internal_users.template.yml:ro
+      - ./docker/opensearch/security/internal_users.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/internal_users.yml
+      - ./docker/opensearch/security/tenants.yml:/usr/share/opensearch/plugins/opensearch-security/securityconfig/tenants.yml:ro
+      - ./docker/opensearch/opensearch.yml:/usr/share/opensearch/config/opensearch.yml:ro
+      - ./docker/opensearch/init-security.sh:/usr/share/opensearch/init-security.sh:ro
       # internal ssl files
       - ./ssl/node1-crt.pem:/usr/share/opensearch/config/node-crt.pem:ro
       - ./ssl/node1-key.pem:/usr/share/opensearch/config/node-key.pem:ro
@@ -38,4 +37,3 @@ services:
       # ssl for external communication
       - ./ssl/cluster-crt.pem:/usr/share/opensearch/config/cluster-crt.pem:ro
       - ./ssl/cluster-key.pem:/usr/share/opensearch/config/cluster-key.pem:ro
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 94c8cab30dd752694a45cb75749421acc6c34b13..1b0d09e94e3dc89a92cd66c6137baba614670d3e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   os-node-1:
     extends:
@@ -33,7 +31,7 @@ services:
     ports:
       - ${DASHBOARDS_PORT:-443}:5601
     volumes:
-      - ./dashboards/config/opensearch_dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml:ro
+      - ./docker/dashboards/config/opensearch_dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml:ro
       - ./ssl/dashboards-crt.pem:/usr/share/opensearch-dashboards/config/crt.pem:ro
       - ./ssl/dashboards-key.pem:/usr/share/opensearch-dashboards/config/key.pem:ro
       - ./ssl/root-ca-crt.pem:/usr/share/opensearch-dashboards/config/root-ca.pem:ro
@@ -58,7 +56,7 @@ services:
       - /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro
       - /proc:/hostfs/proc:ro
       - /:/hostfs:ro
-      - ./metricbeat/metricbeat.yml:/usr/share/metricbeat/metricbeat.yml:ro
+      - ./docker/metricbeat/metricbeat.yml:/usr/share/metricbeat/metricbeat.yml:ro
     depends_on:
       - os-node-1
 
@@ -67,5 +65,6 @@ volumes:
   os-node-2:
   metricbeat-data:
 
+
 networks:
   default:
diff --git a/dashboards/config/opensearch_dashboards.yml b/docker/dashboards/config/opensearch_dashboards.yml
similarity index 100%
rename from dashboards/config/opensearch_dashboards.yml
rename to docker/dashboards/config/opensearch_dashboards.yml
diff --git a/metricbeat/metricbeat.yml b/docker/metricbeat/metricbeat.yml
similarity index 100%
rename from metricbeat/metricbeat.yml
rename to docker/metricbeat/metricbeat.yml
diff --git a/opensearch/init-security.sh b/docker/opensearch/init-security.sh
similarity index 100%
rename from opensearch/init-security.sh
rename to docker/opensearch/init-security.sh
diff --git a/opensearch/opensearch.yml b/docker/opensearch/opensearch.yml
similarity index 100%
rename from opensearch/opensearch.yml
rename to docker/opensearch/opensearch.yml
diff --git a/opensearch/security/internal_users.template.yml b/docker/opensearch/security/internal_users.template.yml
similarity index 100%
rename from opensearch/security/internal_users.template.yml
rename to docker/opensearch/security/internal_users.template.yml
diff --git a/opensearch/security/tenants.yml b/docker/opensearch/security/tenants.yml
similarity index 100%
rename from opensearch/security/tenants.yml
rename to docker/opensearch/security/tenants.yml