diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index ec83402f..4637f903 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -6,9 +6,31 @@ jobs:
   build-stack:
     runs-on: ubuntu-latest
     steps:
+
     - name: Check out code
       uses: actions/checkout@v2
+
     - name: Build the docker-compose stack
       run: docker-compose -f build-from-sources.yml up -d --build
+
     - name: Check running containers
       run: docker ps -a
+
+    - name: Shutdown the stack
+      run: docker-compose -f build-from-sources.yml kill
+
+    - name: Install Goss
+      uses: e1himself/goss-installation-action@v1.0.3
+      with:
+        version: v0.3.16
+
+    - name: Execute Goss tests (wazuh-odfe)
+      run: dgoss run wazuh/wazuh-odfe:dev-version
+      env:
+        GOSS_SLEEP: 30
+        GOSS_FILE: .goss.yaml
+
+    - name: Execute Goss tests (wazuh-kibana-odfe)
+      run: dgoss run wazuh/wazuh-kibana-odfe:dev-version
+      env:
+        GOSS_FILE: .goss.kibana.yaml
diff --git a/.goss.kibana.yaml b/.goss.kibana.yaml
new file mode 100644
index 00000000..b5c0ea6b
--- /dev/null
+++ b/.goss.kibana.yaml
@@ -0,0 +1,53 @@
+file:
+  /usr/share/kibana/config/kibana.yml:
+    exists: true
+    mode: "0664"
+    owner: kibana
+    group: root
+    filetype: file
+    contains: []
+  /usr/share/kibana/optimize/bundles/light_theme.style.css:
+    exists: true
+    mode: "0664"
+    owner: kibana
+    group: root
+    filetype: file
+    contains: []
+  /usr/share/kibana/optimize/bundles/wazuh_logo_circle.svg:
+    exists: true
+    mode: "0644"
+    owner: kibana
+    group: root
+    filetype: file
+    contains: []
+  /usr/share/kibana/optimize/bundles/wazuh_wazuh_bg.svg:
+    exists: true
+    mode: "0644"
+    owner: kibana
+    group: root
+    filetype: file
+    contains: []
+  /usr/share/kibana/optimize/wazuh/config/wazuh.yml:
+    exists: true
+    mode: "0644"
+    owner: kibana
+    group: kibana
+    filetype: file
+    contains: []
+  /usr/share/kibana/src/legacy/ui/ui_render/bootstrap/template.js.hbs:
+    exists: true
+    mode: "0664"
+    owner: kibana
+    group: root
+    filetype: file
+    contains: []
+user:
+  kibana:
+    exists: true
+    groups:
+    - kibana
+    home: /usr/share/kibana
+    shell: /bin/bash
+group:
+  kibana:
+    exists: true
diff --git a/.goss.yaml b/.goss.yaml
new file mode 100644
index 00000000..1d84c367
--- /dev/null
+++ b/.goss.yaml
@@ -0,0 +1,115 @@
+file:
+  /etc/filebeat/filebeat.yml:
+    exists: true
+    mode: "0644"
+    owner: root
+    group: root
+    filetype: file
+    contains: []
+  /var/ossec/bin/ossec-control:
+    exists: true
+    mode: "0750"
+    owner: root
+    group: root
+    filetype: file
+    contains: []
+  /var/ossec/etc/lists/audit-keys:
+    exists: true
+    mode: "0660"
+    owner: ossec
+    group: ossec
+    filetype: file
+    contains: []
+  /var/ossec/etc/ossec.conf:
+    exists: true
+    mode: "0660"
+    owner: root
+    group: ossec
+    filetype: file
+    contains: []
+  /var/ossec/etc/rules/local_rules.xml:
+    exists: true
+    mode: "0660"
+    owner: ossec
+    group: ossec
+    filetype: file
+    contains: []
+  /var/ossec/etc/sslmanager.cert:
+    exists: true
+    mode: "0640"
+    owner: root
+    group: root
+    filetype: file
+    contains: []
+  /var/ossec/etc/sslmanager.key:
+    exists: true
+    mode: "0640"
+    owner: root
+    group: root
+    filetype: file
+    contains: []
+package:
+  filebeat:
+    installed: true
+    versions:
+    - 7.9.1
+  wazuh-manager:
+    installed: true
+    versions:
+    - 4.0.4
+port:
+  tcp:1514:
+    listening: true
+    ip:
+    - 0.0.0.0
+  tcp:1515:
+    listening: true
+    ip:
+    - 0.0.0.0
+  tcp:55000:
+    listening: true
+    ip:
+    - 0.0.0.0
+user:
+  ossec:
+    exists: true
+    groups:
+    - ossec
+    home: /var/ossec
+    shell: /sbin/nologin
+  ossecm:
+    exists: true
+    groups:
+    - ossec
+    home: /var/ossec
+    shell: /sbin/nologin
+  ossecr:
+    exists: true
+    groups:
+    - ossec
+    home: /var/ossec
+    shell: /sbin/nologin
+group:
+  ossec:
+    exists: true
+process:
+  filebeat:
+    running: true
+  ossec-analysisd:
+    running: true
+  ossec-authd:
+    running: true
+  ossec-execd:
+    running: true
+  ossec-monitord:
+    running: true
+  ossec-remoted:
+    running: true
+  ossec-syscheckd:
+    running: true
+  s6-supervise:
+    running: true
+  wazuh-db:
+    running: true
+  wazuh-modulesd:
+    running: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa23b9e4..4ad21a86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Wazuh Docker v4.0.4_1.11.0
+
+### Added
+
+- Update to Wazuh version [4.0.4](https://github.com/wazuh/wazuh/blob/v4.0.4/CHANGELOG.md#v404)
+
+
 ## Wazuh Docker v4.0.3_1.11.0
 
 ### Added
diff --git a/LICENSE b/LICENSE
index 40f5e6c3..51ab7d2f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 
- Portions Copyright (C) 2020 Wazuh, Inc.
+ Portions Copyright (C) 2021 Wazuh, Inc.
  Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc.
 
  This program is a free software; you can redistribute it and/or modify
diff --git a/README.md b/README.md
index 49d8a5d0..257810a5 100644
--- a/README.md
+++ b/README.md
@@ -155,6 +155,8 @@ ADMIN_PRIVILEGES=true               # App privileges
 
 | Wazuh version | ODFE    |
 |---------------|---------|
+| v4.0.4        | 1.11.0  |
+|---------------|---------|
 | v4.0.3        | 1.11.0  |
 |---------------|---------|
 | v4.0.2        | 1.11.0  |
@@ -174,7 +176,7 @@ We thank you them and everyone else who has contributed to this project.
 
 ## License and copyright
 
-Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
+Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 
 ## Web references
 
diff --git a/VERSION b/VERSION
index 8ce8bfc8..7563f1f1 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="4.0.3_1.11.0"
-REVISION="40300"
+WAZUH-DOCKER_VERSION="4.0.4_1.11.0"
+REVISION="40400"
diff --git a/build-from-sources.yml b/build-from-sources.yml
index db1c042a..49120850 100644
--- a/build-from-sources.yml
+++ b/build-from-sources.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:
diff --git a/docker-compose.yml b/docker-compose.yml
index 1b65f92c..12686ea3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,9 @@
-# Wazuh App Copyright (C) 2020 Wazuh Inc. (License GPLv2)
+# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 version: '3.7'
 
 services:
   wazuh:
-    image: wazuh/wazuh-odfe:4.0.3_1.11.0
+    image: wazuh/wazuh-odfe:4.0.4_1.11.0
     hostname: wazuh-manager
     restart: always
     ports:
@@ -50,7 +50,7 @@ services:
         hard: 65536
 
   kibana:
-    image: wazuh/wazuh-kibana-odfe:4.0.3_1.11.0
+    image: wazuh/wazuh-kibana-odfe:4.0.4_1.11.0
     hostname: kibana
     restart: always
     ports:
diff --git a/generate-opendistro-certs.yml b/generate-opendistro-certs.yml
index 4c83507a..cd23e310 100644
--- a/generate-opendistro-certs.yml
+++ b/generate-opendistro-certs.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'
 
 services:
diff --git a/kibana-odfe/Dockerfile b/kibana-odfe/Dockerfile
index 48a9e293..de07eac0 100644
--- a/kibana-odfe/Dockerfile
+++ b/kibana-odfe/Dockerfile
@@ -1,8 +1,8 @@
-# Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 FROM amazon/opendistro-for-elasticsearch-kibana:1.11.0
 USER kibana
 ARG ELASTIC_VERSION=7.9.1
-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/kibana-odfe/config/entrypoint.sh b/kibana-odfe/config/entrypoint.sh
index f2c017f1..f96672fb 100644
--- a/kibana-odfe/config/entrypoint.sh
+++ b/kibana-odfe/config/entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 
 set -e
 
diff --git a/kibana-odfe/config/kibana_settings.sh b/kibana-odfe/config/kibana_settings.sh
index b0c56e4d..4bc39a5f 100644
--- a/kibana-odfe/config/kibana_settings.sh
+++ b/kibana-odfe/config/kibana_settings.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 
 WAZUH_MAJOR=4
 
diff --git a/kibana-odfe/config/wazuh.yml b/kibana-odfe/config/wazuh.yml
index 6c52d526..3b074c61 100644
--- a/kibana-odfe/config/wazuh.yml
+++ b/kibana-odfe/config/wazuh.yml
@@ -1,7 +1,7 @@
 ---
 #
 # Wazuh app - App configuration file
-# Copyright (C) 2015-2020 Wazuh, Inc.
+# Copyright (C) 2015-2021 Wazuh, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/kibana-odfe/config/wazuh_app_config.sh b/kibana-odfe/config/wazuh_app_config.sh
index 7ff90337..c08980a5 100644
--- a/kibana-odfe/config/wazuh_app_config.sh
+++ b/kibana-odfe/config/wazuh_app_config.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 
 wazuh_url="${WAZUH_API_URL:-https://wazuh}"
 wazuh_port="${API_PORT:-55000}"
diff --git a/kibana-odfe/config/welcome_wazuh.sh b/kibana-odfe/config/welcome_wazuh.sh
index 74ae2eef..50b1d56e 100644
--- a/kibana-odfe/config/welcome_wazuh.sh
+++ b/kibana-odfe/config/welcome_wazuh.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 
 if [[ $CHANGE_WELCOME == "true" ]]
 then
diff --git a/production-cluster.yml b/production-cluster.yml
index 3c3bb0d6..f6b30281 100644
--- a/production-cluster.yml
+++ b/production-cluster.yml
@@ -1,9 +1,9 @@
-# Wazuh App Copyright (C) 2020 Wazuh Inc. (License GPLv2)
+# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 version: '3.7'
 
 services:
   wazuh-master:
-    image: wazuh/wazuh-odfe:4.0.3_1.11.0
+    image: wazuh/wazuh-odfe:4.0.4_1.11.0
     hostname: wazuh-master
     restart: always
     ports:
@@ -38,7 +38,7 @@ services:
       - ./production_cluster/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh-worker:
-    image: wazuh/wazuh-odfe:4.0.3_1.11.0
+    image: wazuh/wazuh-odfe:4.0.4_1.11.0
     hostname: wazuh-worker
     restart: always
     environment:
@@ -132,7 +132,7 @@ services:
       - ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
 
   kibana:
-    image: wazuh/wazuh-kibana-odfe:4.0.3_1.11.0
+    image: wazuh/wazuh-kibana-odfe:4.0.4_1.11.0
     hostname: kibana
     restart: always
     ports:
diff --git a/wazuh-odfe/Dockerfile b/wazuh-odfe/Dockerfile
index 8daabe71..01df48b5 100644
--- a/wazuh-odfe/Dockerfile
+++ b/wazuh-odfe/Dockerfile
@@ -1,8 +1,8 @@
-# Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 FROM centos:7
 
 ARG FILEBEAT_VERSION=7.9.1
-ARG WAZUH_VERSION=4.0.3-1
+ARG WAZUH_VERSION=4.0.4-1
 ARG TEMPLATE_VERSION="master"
 ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz"
 
diff --git a/wazuh-odfe/config/etc/cont-init.d/0-wazuh-init b/wazuh-odfe/config/etc/cont-init.d/0-wazuh-init
index 68538c10..1973f85a 100644
--- a/wazuh-odfe/config/etc/cont-init.d/0-wazuh-init
+++ b/wazuh-odfe/config/etc/cont-init.d/0-wazuh-init
@@ -1,5 +1,5 @@
 #!/usr/bin/with-contenv bash
-# Wazuh App Copyright (C) 2020 Wazuh Inc. (License GPLv2)
+# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 
 # Variables
 source /permanent_data.env
diff --git a/wazuh-odfe/config/etc/cont-init.d/1-config-filebeat b/wazuh-odfe/config/etc/cont-init.d/1-config-filebeat
index ce033aa5..b77a550d 100644
--- a/wazuh-odfe/config/etc/cont-init.d/1-config-filebeat
+++ b/wazuh-odfe/config/etc/cont-init.d/1-config-filebeat
@@ -1,5 +1,5 @@
 #!/usr/bin/with-contenv bash
-# Wazuh App Copyright (C) 2020 Wazuh Inc. (License GPLv2)
+# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 
 set -e
 
diff --git a/wazuh-odfe/config/permanent_data.sh b/wazuh-odfe/config/permanent_data.sh
index 7dfaa647..600af0f1 100644
--- a/wazuh-odfe/config/permanent_data.sh
+++ b/wazuh-odfe/config/permanent_data.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Wazuh App Copyright (C) 2020 Wazuh Inc. (License GPLv2)
+# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 
 # Variables
 source /permanent_data.env