diff --git a/docker-compose.yml b/docker-compose.yml
index 67fe1c5f..5bf938bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,8 +3,7 @@ version: '3.7'
 
 services:
   wazuh:
-    build: wazuh-opendistro/
-    image: wazuh-opendistro
+    image: wazuh/wazuh-odfe:4.0.0
     hostname: wazuh-manager
     restart: always
     ports:
@@ -51,8 +50,7 @@ services:
         hard: 65536
 
   kibana:
-    build: kibana-opendistro/
-    image: wazuh-kibana-opendistro
+    image: wazuh/wazuh-kibana-odfe:4.0.0
     hostname: kibana
     restart: always
     ports:
diff --git a/kibana-opendistro/Dockerfile b/kibana-odfe/Dockerfile
similarity index 100%
rename from kibana-opendistro/Dockerfile
rename to kibana-odfe/Dockerfile
diff --git a/kibana-opendistro/config/custom_welcome/light_theme.style.css b/kibana-odfe/config/custom_welcome/light_theme.style.css
similarity index 100%
rename from kibana-opendistro/config/custom_welcome/light_theme.style.css
rename to kibana-odfe/config/custom_welcome/light_theme.style.css
diff --git a/kibana-opendistro/config/custom_welcome/template.js.hbs b/kibana-odfe/config/custom_welcome/template.js.hbs
similarity index 100%
rename from kibana-opendistro/config/custom_welcome/template.js.hbs
rename to kibana-odfe/config/custom_welcome/template.js.hbs
diff --git a/kibana-opendistro/config/custom_welcome/wazuh_logo_circle.svg b/kibana-odfe/config/custom_welcome/wazuh_logo_circle.svg
similarity index 100%
rename from kibana-opendistro/config/custom_welcome/wazuh_logo_circle.svg
rename to kibana-odfe/config/custom_welcome/wazuh_logo_circle.svg
diff --git a/kibana-opendistro/config/custom_welcome/wazuh_wazuh_bg.svg b/kibana-odfe/config/custom_welcome/wazuh_wazuh_bg.svg
similarity index 100%
rename from kibana-opendistro/config/custom_welcome/wazuh_wazuh_bg.svg
rename to kibana-odfe/config/custom_welcome/wazuh_wazuh_bg.svg
diff --git a/kibana-opendistro/config/entrypoint.sh b/kibana-odfe/config/entrypoint.sh
similarity index 100%
rename from kibana-opendistro/config/entrypoint.sh
rename to kibana-odfe/config/entrypoint.sh
diff --git a/kibana-opendistro/config/kibana_settings.sh b/kibana-odfe/config/kibana_settings.sh
similarity index 100%
rename from kibana-opendistro/config/kibana_settings.sh
rename to kibana-odfe/config/kibana_settings.sh
diff --git a/kibana-opendistro/config/wazuh.yml b/kibana-odfe/config/wazuh.yml
similarity index 100%
rename from kibana-opendistro/config/wazuh.yml
rename to kibana-odfe/config/wazuh.yml
diff --git a/kibana-opendistro/config/wazuh_app_config.sh b/kibana-odfe/config/wazuh_app_config.sh
similarity index 100%
rename from kibana-opendistro/config/wazuh_app_config.sh
rename to kibana-odfe/config/wazuh_app_config.sh
diff --git a/kibana-opendistro/config/welcome_wazuh.sh b/kibana-odfe/config/welcome_wazuh.sh
similarity index 100%
rename from kibana-opendistro/config/welcome_wazuh.sh
rename to kibana-odfe/config/welcome_wazuh.sh
diff --git a/production-cluster.yml b/production-cluster.yml
index ebf003ef..6b537301 100644
--- a/production-cluster.yml
+++ b/production-cluster.yml
@@ -3,8 +3,7 @@ version: '3.7'
 
 services:
   wazuh-master:
-    build: wazuh-opendistro/
-    image: wazuh-opendistro
+    image: wazuh/wazuh-odfe:4.0.0
     hostname: wazuh-master
     restart: always
     ports:
@@ -39,8 +38,7 @@ services:
       - ./production_cluster/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh-worker:
-    build: wazuh-opendistro/
-    image: wazuh-opendistro
+    image: wazuh/wazuh-odfe:4.0.0
     hostname: wazuh-worker
     restart: always
     environment:
@@ -134,8 +132,7 @@ services:
       - ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
 
   kibana:
-    build: kibana-opendistro/
-    image: wazuh-kibana-opendistro
+    image: wazuh/wazuh-kibana-odfe:4.0.0
     hostname: kibana
     restart: always
     ports:
diff --git a/wazuh-opendistro/Dockerfile b/wazuh-odfe/Dockerfile
similarity index 100%
rename from wazuh-opendistro/Dockerfile
rename to wazuh-odfe/Dockerfile
diff --git a/wazuh-opendistro/config/create_user.py b/wazuh-odfe/config/create_user.py
similarity index 100%
rename from wazuh-opendistro/config/create_user.py
rename to wazuh-odfe/config/create_user.py
diff --git a/wazuh-opendistro/config/etc/cont-init.d/0-wazuh-init b/wazuh-odfe/config/etc/cont-init.d/0-wazuh-init
similarity index 100%
rename from wazuh-opendistro/config/etc/cont-init.d/0-wazuh-init
rename to wazuh-odfe/config/etc/cont-init.d/0-wazuh-init
diff --git a/wazuh-opendistro/config/etc/cont-init.d/1-config-filebeat b/wazuh-odfe/config/etc/cont-init.d/1-config-filebeat
similarity index 100%
rename from wazuh-opendistro/config/etc/cont-init.d/1-config-filebeat
rename to wazuh-odfe/config/etc/cont-init.d/1-config-filebeat
diff --git a/wazuh-opendistro/config/etc/cont-init.d/2-manager b/wazuh-odfe/config/etc/cont-init.d/2-manager
similarity index 100%
rename from wazuh-opendistro/config/etc/cont-init.d/2-manager
rename to wazuh-odfe/config/etc/cont-init.d/2-manager
diff --git a/wazuh-opendistro/config/etc/services.d/filebeat/finish b/wazuh-odfe/config/etc/services.d/filebeat/finish
similarity index 100%
rename from wazuh-opendistro/config/etc/services.d/filebeat/finish
rename to wazuh-odfe/config/etc/services.d/filebeat/finish
diff --git a/wazuh-opendistro/config/etc/services.d/filebeat/run b/wazuh-odfe/config/etc/services.d/filebeat/run
similarity index 100%
rename from wazuh-opendistro/config/etc/services.d/filebeat/run
rename to wazuh-odfe/config/etc/services.d/filebeat/run
diff --git a/wazuh-opendistro/config/filebeat.yml b/wazuh-odfe/config/filebeat.yml
similarity index 100%
rename from wazuh-opendistro/config/filebeat.yml
rename to wazuh-odfe/config/filebeat.yml
diff --git a/wazuh-opendistro/config/permanent_data.env b/wazuh-odfe/config/permanent_data.env
similarity index 100%
rename from wazuh-opendistro/config/permanent_data.env
rename to wazuh-odfe/config/permanent_data.env
diff --git a/wazuh-opendistro/config/permanent_data.sh b/wazuh-odfe/config/permanent_data.sh
similarity index 100%
rename from wazuh-opendistro/config/permanent_data.sh
rename to wazuh-odfe/config/permanent_data.sh
diff --git a/wazuh-opendistro/config/wazuh.repo b/wazuh-odfe/config/wazuh.repo
similarity index 100%
rename from wazuh-opendistro/config/wazuh.repo
rename to wazuh-odfe/config/wazuh.repo