diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 813705c4..69ad44fa 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,8 +1,8 @@
-# Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 FROM docker.elastic.co/kibana/kibana:7.9.3
 USER kibana
 ARG ELASTIC_VERSION=7.9.3
-ARG WAZUH_VERSION=4.0.3
+ARG WAZUH_VERSION=4.0.4
 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
 
 WORKDIR /usr/share/kibana
diff --git a/xpack-compose.yml b/xpack-compose.yml
index 42faafa3..fbbc20c3 100644
--- a/xpack-compose.yml
+++ b/xpack-compose.yml
@@ -1,4 +1,4 @@
-# Wazuh App Copyright (C) 2020 Wazuh Inc. (License GPLv2)
+# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 version: '3.7'
 
 services:
@@ -8,7 +8,7 @@ services:
       args:
         - FILEBEAT_CHANNEL=filebeat
         - FILEBEAT_VERSION=7.9.3
-    image: wazuh/wazuh:4.0.3_7.9.3_dev
+    image: wazuh/wazuh:4.0.4_7.9.3_dev
     hostname: wazuh-manager
     restart: always
     ports:
@@ -56,7 +56,7 @@ services:
 
   kibana:
     build: kibana/
-    image: wazuh/wazuh-kibana:4.0.3_7.9.3_dev
+    image: wazuh/wazuh-kibana:4.0.4_7.9.3_dev
     hostname: kibana
     restart: always
     ports: