From 020031c81d71266550df7a476da6621a7f101242 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Tue, 17 May 2022 15:49:38 -0300
Subject: [PATCH 01/15] Modify Dashboard user parameter

---
 build-docker-images/wazuh-dashboard/Dockerfile         |  5 -----
 .../wazuh-dashboard/config/entrypoint.sh               | 10 ++++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile
index e53f84c7..6822025a 100644
--- a/build-docker-images/wazuh-dashboard/Dockerfile
+++ b/build-docker-images/wazuh-dashboard/Dockerfile
@@ -19,11 +19,6 @@ COPY config/config.sh .
 COPY config/config.yml /
 RUN bash config.sh
 
-# Create and configure Wazuh dashboard keystore
-RUN $INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \
-    echo kibanaserver | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \
-    echo kibanaserver | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root
-
 # Install Wazuh App
 RUN $INSTALL_DIR/bin/opensearch-dashboards-plugin install https://packages.wazuh.com/4.x/ui/dashboard/wazuh-${WAZUH_VERSION}.zip --allow-root
 
diff --git a/build-docker-images/wazuh-dashboard/config/entrypoint.sh b/build-docker-images/wazuh-dashboard/config/entrypoint.sh
index d25432fa..6d6b1932 100644
--- a/build-docker-images/wazuh-dashboard/config/entrypoint.sh
+++ b/build-docker-images/wazuh-dashboard/config/entrypoint.sh
@@ -1,6 +1,16 @@
 #!/bin/bash
 # Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 
+INSTALL_DIR=/usr/share/wazuh-dashboard
+DASHBOARD_USERNAME="${DASHBOARD_USERNAME:-kibanaserver}"
+DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}"
+
+# Create and configure Wazuh dashboard keystore
+
+$INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \
+echo $DASHBOARD_USERNAME | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \
+echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root
+
 ##############################################################################
 # Start Wazuh dashboard
 ##############################################################################

From f678aaf1e02187141981f57b64622fb1a4f05483 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Tue, 17 May 2022 17:34:24 -0300
Subject: [PATCH 02/15] Modify Dashboard user parameter

---
 build-docker-images/wazuh-dashboard/config/entrypoint.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build-docker-images/wazuh-dashboard/config/entrypoint.sh b/build-docker-images/wazuh-dashboard/config/entrypoint.sh
index 6d6b1932..282f152c 100644
--- a/build-docker-images/wazuh-dashboard/config/entrypoint.sh
+++ b/build-docker-images/wazuh-dashboard/config/entrypoint.sh
@@ -7,7 +7,10 @@ DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}"
 
 # Create and configure Wazuh dashboard keystore
 
-$INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \
+$INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root
+
+/wazuh_app_config.sh
+
 echo $DASHBOARD_USERNAME | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \
 echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root
 
@@ -15,6 +18,5 @@ echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add o
 # Start Wazuh dashboard
 ##############################################################################
 
-/wazuh_app_config.sh
 
 /usr/share/wazuh-dashboard/bin/opensearch-dashboards -c /usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
\ No newline at end of file

From 7d06cb56efc51d61086ec70dbe6edf4aad45cc82 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Tue, 17 May 2022 17:58:22 -0300
Subject: [PATCH 03/15] Modify Dashboard user parameter

---
 build-docker-images/wazuh-dashboard/config/entrypoint.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/build-docker-images/wazuh-dashboard/config/entrypoint.sh b/build-docker-images/wazuh-dashboard/config/entrypoint.sh
index 282f152c..6356110c 100644
--- a/build-docker-images/wazuh-dashboard/config/entrypoint.sh
+++ b/build-docker-images/wazuh-dashboard/config/entrypoint.sh
@@ -7,10 +7,8 @@ DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}"
 
 # Create and configure Wazuh dashboard keystore
 
-$INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root
-
-/wazuh_app_config.sh
-
+$INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \
+sleep 10 && \
 echo $DASHBOARD_USERNAME | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \
 echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root
 
@@ -18,5 +16,6 @@ echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add o
 # Start Wazuh dashboard
 ##############################################################################
 
+/wazuh_app_config.sh
 
 /usr/share/wazuh-dashboard/bin/opensearch-dashboards -c /usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
\ No newline at end of file

From bfeb4b007a6fc85a08fb3d76965dda79494c9396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <teddytpc1@gmail.com>
Date: Tue, 17 May 2022 19:45:53 -0300
Subject: [PATCH 04/15] Dashboard entrypoint update

---
 build-docker-images/wazuh-dashboard/config/entrypoint.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build-docker-images/wazuh-dashboard/config/entrypoint.sh b/build-docker-images/wazuh-dashboard/config/entrypoint.sh
index 6356110c..6d6b1932 100644
--- a/build-docker-images/wazuh-dashboard/config/entrypoint.sh
+++ b/build-docker-images/wazuh-dashboard/config/entrypoint.sh
@@ -8,7 +8,6 @@ DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}"
 # Create and configure Wazuh dashboard keystore
 
 $INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \
-sleep 10 && \
 echo $DASHBOARD_USERNAME | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \
 echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root
 

From 70c3a2929e35369b380e35b264f06a185dede44e Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Mon, 23 May 2022 10:54:57 -0300
Subject: [PATCH 05/15] fix whitelist

---
 multi-node/config/wazuh_cluster/wazuh_manager.conf  | 1 -
 multi-node/config/wazuh_cluster/wazuh_worker.conf   | 1 -
 single-node/config/wazuh_cluster/wazuh_manager.conf | 1 -
 3 files changed, 3 deletions(-)

diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf
index 70bb61fc..8747f02e 100644
--- a/multi-node/config/wazuh_cluster/wazuh_manager.conf
+++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf
@@ -222,7 +222,6 @@
   <global>
     <white_list>127.0.0.1</white_list>
     <white_list>^localhost.localdomain$</white_list>
-    <white_list>127.0.0.53</white_list>
   </global>
 
   <command>
diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf
index 38d72010..dc4475d2 100644
--- a/multi-node/config/wazuh_cluster/wazuh_worker.conf
+++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf
@@ -222,7 +222,6 @@
   <global>
     <white_list>127.0.0.1</white_list>
     <white_list>^localhost.localdomain$</white_list>
-    <white_list>127.0.0.53</white_list>
   </global>
 
   <command>
diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf
index aff1af9d..cd432c19 100644
--- a/single-node/config/wazuh_cluster/wazuh_manager.conf
+++ b/single-node/config/wazuh_cluster/wazuh_manager.conf
@@ -222,7 +222,6 @@
   <global>
     <white_list>127.0.0.1</white_list>
     <white_list>^localhost.localdomain$</white_list>
-    <white_list>10.0.0.106</white_list>
   </global>
 
   <command>

From ae558612df412032e807021599922b51f29adb72 Mon Sep 17 00:00:00 2001
From: Alberto R <alberpilot@gmail.com>
Date: Tue, 24 May 2022 14:13:16 +0200
Subject: [PATCH 06/15] Changed copyright format

---
 LICENSE                                                         | 2 +-
 README.md                                                       | 2 +-
 build-docker-images/docker-compose.yml                          | 2 +-
 build-docker-images/wazuh-dashboard/Dockerfile                  | 2 +-
 build-docker-images/wazuh-dashboard/config/config.sh            | 2 +-
 build-docker-images/wazuh-dashboard/config/entrypoint.sh        | 2 +-
 build-docker-images/wazuh-dashboard/config/wazuh.yml            | 2 +-
 build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh  | 2 +-
 build-docker-images/wazuh-indexer/Dockerfile                    | 2 +-
 build-docker-images/wazuh-indexer/config/config.sh              | 2 +-
 build-docker-images/wazuh-indexer/config/entrypoint.sh          | 2 +-
 build-docker-images/wazuh-indexer/config/securityadmin.sh       | 2 +-
 build-docker-images/wazuh-manager/Dockerfile                    | 2 +-
 .../wazuh-manager/config/etc/cont-init.d/0-wazuh-init           | 2 +-
 .../wazuh-manager/config/etc/cont-init.d/1-config-filebeat      | 2 +-
 build-docker-images/wazuh-manager/config/permanent_data.sh      | 2 +-
 indexer-certs-creator/Dockerfile                                | 2 +-
 indexer-certs-creator/config/entrypoint.sh                      | 2 +-
 multi-node/docker-compose.yml                                   | 2 +-
 multi-node/generate-indexer-certs.yml                           | 2 +-
 single-node/docker-compose.yml                                  | 2 +-
 single-node/generate-indexer-certs.yml                          | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/LICENSE b/LICENSE
index 51ab7d2f..a6376ec3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 
- Portions Copyright (C) 2021 Wazuh, Inc.
+ Portions Copyright (C) 2017, 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 ec18839a..8b38ee85 100644
--- a/README.md
+++ b/README.md
@@ -224,7 +224,7 @@ We thank you them and everyone else who has contributed to this project.
 
 ## License and copyright
 
-Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 
 ## Web references
 
diff --git a/build-docker-images/docker-compose.yml b/build-docker-images/docker-compose.yml
index e7baf189..0c8dad97 100644
--- a/build-docker-images/docker-compose.yml
+++ b/build-docker-images/docker-compose.yml
@@ -1,4 +1,4 @@
-# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 version: '3.7'
 
 services:
diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile
index 6822025a..238f3444 100644
--- a/build-docker-images/wazuh-dashboard/Dockerfile
+++ b/build-docker-images/wazuh-dashboard/Dockerfile
@@ -1,4 +1,4 @@
-# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 FROM ubuntu:focal AS builder
 
 ARG WAZUH_VERSION=4.3.1
diff --git a/build-docker-images/wazuh-dashboard/config/config.sh b/build-docker-images/wazuh-dashboard/config/config.sh
index 71cc485b..c33f8eb4 100644
--- a/build-docker-images/wazuh-dashboard/config/config.sh
+++ b/build-docker-images/wazuh-dashboard/config/config.sh
@@ -1,4 +1,4 @@
-# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
diff --git a/build-docker-images/wazuh-dashboard/config/entrypoint.sh b/build-docker-images/wazuh-dashboard/config/entrypoint.sh
index 6d6b1932..54fe0d3e 100644
--- a/build-docker-images/wazuh-dashboard/config/entrypoint.sh
+++ b/build-docker-images/wazuh-dashboard/config/entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 
 INSTALL_DIR=/usr/share/wazuh-dashboard
 DASHBOARD_USERNAME="${DASHBOARD_USERNAME:-kibanaserver}"
diff --git a/build-docker-images/wazuh-dashboard/config/wazuh.yml b/build-docker-images/wazuh-dashboard/config/wazuh.yml
index 2c5649d7..e06980fa 100644
--- a/build-docker-images/wazuh-dashboard/config/wazuh.yml
+++ b/build-docker-images/wazuh-dashboard/config/wazuh.yml
@@ -1,7 +1,7 @@
 ---
 #
 # Wazuh app - App configuration file
-# Copyright (C) 2015-2021 Wazuh, Inc.
+# Copyright (C) 2017, 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/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh b/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh
index 3b5f2f5d..2457315a 100644
--- a/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh
+++ b/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 
 wazuh_url="${WAZUH_API_URL:-https://wazuh}"
 wazuh_port="${API_PORT:-55000}"
diff --git a/build-docker-images/wazuh-indexer/Dockerfile b/build-docker-images/wazuh-indexer/Dockerfile
index e4c61e2a..9a6c700d 100644
--- a/build-docker-images/wazuh-indexer/Dockerfile
+++ b/build-docker-images/wazuh-indexer/Dockerfile
@@ -1,4 +1,4 @@
-# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 FROM ubuntu:focal AS builder
 
 RUN apt-get update -y && apt-get install curl openssl xz-utils -y
diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh
index 6043789b..1b0fdd65 100644
--- a/build-docker-images/wazuh-indexer/config/config.sh
+++ b/build-docker-images/wazuh-indexer/config/config.sh
@@ -1,4 +1,4 @@
-# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
diff --git a/build-docker-images/wazuh-indexer/config/entrypoint.sh b/build-docker-images/wazuh-indexer/config/entrypoint.sh
index 084573fc..9b8747b5 100644
--- a/build-docker-images/wazuh-indexer/config/entrypoint.sh
+++ b/build-docker-images/wazuh-indexer/config/entrypoint.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 set -e
 
 umask 0002
diff --git a/build-docker-images/wazuh-indexer/config/securityadmin.sh b/build-docker-images/wazuh-indexer/config/securityadmin.sh
index f9a5bb10..1fcf6467 100644
--- a/build-docker-images/wazuh-indexer/config/securityadmin.sh
+++ b/build-docker-images/wazuh-indexer/config/securityadmin.sh
@@ -1,3 +1,3 @@
-# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 sleep 30
 bash /usr/share/wazuh-indexer/plugins/opensearch-security/tools/securityadmin.sh -cd /usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/ -nhnv -cacert  $CACERT -cert $CERT -key $KEY -p 9300 -icl
\ No newline at end of file
diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile
index 27b2418b..d50982f1 100644
--- a/build-docker-images/wazuh-manager/Dockerfile
+++ b/build-docker-images/wazuh-manager/Dockerfile
@@ -1,4 +1,4 @@
-# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 FROM ubuntu:focal
 
 ARG WAZUH_VERSION=4.3.1
diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init
index c0e2ffff..0e93d33d 100644
--- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init
+++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init
@@ -1,5 +1,5 @@
 #!/usr/bin/with-contenv bash
-# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 
 # Variables
 source /permanent_data.env
diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat b/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat
index e475e357..c9062ba0 100644
--- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat
+++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat
@@ -1,5 +1,5 @@
 #!/usr/bin/with-contenv bash
-# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 
 set -e
 
diff --git a/build-docker-images/wazuh-manager/config/permanent_data.sh b/build-docker-images/wazuh-manager/config/permanent_data.sh
index 600af0f1..4df54af5 100644
--- a/build-docker-images/wazuh-manager/config/permanent_data.sh
+++ b/build-docker-images/wazuh-manager/config/permanent_data.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 
 # Variables
 source /permanent_data.env
diff --git a/indexer-certs-creator/Dockerfile b/indexer-certs-creator/Dockerfile
index d9ac2941..58b2583f 100644
--- a/indexer-certs-creator/Dockerfile
+++ b/indexer-certs-creator/Dockerfile
@@ -1,4 +1,4 @@
-# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 FROM ubuntu:focal
 
 RUN apt-get update && apt-get install openssl curl -y
diff --git a/indexer-certs-creator/config/entrypoint.sh b/indexer-certs-creator/config/entrypoint.sh
index 86cc371f..3dd38447 100644
--- a/indexer-certs-creator/config/entrypoint.sh
+++ b/indexer-certs-creator/config/entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 
 ##############################################################################
 # Downloading Cert Gen Tool
diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml
index e7d77de0..efc53f74 100644
--- a/multi-node/docker-compose.yml
+++ b/multi-node/docker-compose.yml
@@ -1,4 +1,4 @@
-# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 version: '3.7'
 
 services:
diff --git a/multi-node/generate-indexer-certs.yml b/multi-node/generate-indexer-certs.yml
index fb0f5c72..a3398661 100644
--- a/multi-node/generate-indexer-certs.yml
+++ b/multi-node/generate-indexer-certs.yml
@@ -1,4 +1,4 @@
-# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 version: '3'
 
 services:
diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml
index 0a0145a8..d5fcc130 100644
--- a/single-node/docker-compose.yml
+++ b/single-node/docker-compose.yml
@@ -1,4 +1,4 @@
-# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 version: '3.7'
 
 services:
diff --git a/single-node/generate-indexer-certs.yml b/single-node/generate-indexer-certs.yml
index fb0f5c72..a3398661 100644
--- a/single-node/generate-indexer-certs.yml
+++ b/single-node/generate-indexer-certs.yml
@@ -1,4 +1,4 @@
-# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
+# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 version: '3'
 
 services:

From f3ae530bfaf559c24db8f9f6fe6f4a6354dcc7f5 Mon Sep 17 00:00:00 2001
From: Alberto R <alberpilot@gmail.com>
Date: Tue, 24 May 2022 14:14:50 +0200
Subject: [PATCH 07/15] Fixed company name

---
 LICENSE                                              | 2 +-
 build-docker-images/wazuh-dashboard/config/wazuh.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index a6376ec3..05713a81 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 
- Portions Copyright (C) 2017, Wazuh, Inc.
+ Portions Copyright (C) 2017, 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/build-docker-images/wazuh-dashboard/config/wazuh.yml b/build-docker-images/wazuh-dashboard/config/wazuh.yml
index e06980fa..3fab9b09 100644
--- a/build-docker-images/wazuh-dashboard/config/wazuh.yml
+++ b/build-docker-images/wazuh-dashboard/config/wazuh.yml
@@ -1,7 +1,7 @@
 ---
 #
 # Wazuh app - App configuration file
-# Copyright (C) 2017, Wazuh, Inc.
+# Copyright (C) 2017, 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

From 1bc73fb1c4502ce0a886cf34fdfb926eecffc0ac Mon Sep 17 00:00:00 2001
From: dfolcha <daniel.folch@wazuh.com>
Date: Fri, 27 May 2022 15:29:35 +0200
Subject: [PATCH 08/15] Update filebeat module  version

---
 build-docker-images/wazuh-manager/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile
index d50982f1..b22fde78 100644
--- a/build-docker-images/wazuh-manager/Dockerfile
+++ b/build-docker-images/wazuh-manager/Dockerfile
@@ -5,7 +5,7 @@ ARG WAZUH_VERSION=4.3.1
 ARG TEMPLATE_VERSION=4.3
 ARG FILEBEAT_CHANNEL=filebeat-oss
 ARG FILEBEAT_VERSION=7.10.2
-ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz"
+ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"
 
 RUN apt-get update && apt install curl apt-transport-https lsb-release gnupg -y
 

From a453502e9ba44bbcab1811b7246b7379e285eada Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Mon, 30 May 2022 07:00:22 -0300
Subject: [PATCH 09/15] bump 4.3.2 version

---
 .github/.goss.yaml                                |  2 +-
 .github/workflows/push.yml                        |  2 +-
 CHANGELOG.md                                      | 15 +++++++++++++++
 README.md                                         |  3 +++
 VERSION                                           |  4 ++--
 build-docker-images/docker-compose.yml            |  6 +++---
 build-docker-images/wazuh-dashboard/Dockerfile    |  2 +-
 .../wazuh-indexer/config/config.sh                |  2 +-
 build-docker-images/wazuh-manager/Dockerfile      |  2 +-
 multi-node/docker-compose.yml                     | 12 ++++++------
 single-node/docker-compose.yml                    |  6 +++---
 11 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/.github/.goss.yaml b/.github/.goss.yaml
index d0248b51..967bba54 100644
--- a/.github/.goss.yaml
+++ b/.github/.goss.yaml
@@ -56,7 +56,7 @@ package:
   wazuh-manager:
     installed: true
     versions:
-    - 4.3.1
+    - 4.3.2
 port:
   tcp:1514:
     listening: true
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 37b0a58f..cbc397e0 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -25,7 +25,7 @@ jobs:
         version: v0.3.16
 
     - name: Execute Goss tests (wazuh-odfe)
-      run: dgoss run wazuh/wazuh-manager:4.3.1
+      run: dgoss run wazuh/wazuh-manager:4.3.2
       env:
         GOSS_SLEEP: 30
         GOSS_FILE: .github/.goss.yaml
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d6d9579..dddc4d9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Wazuh Docker v4.3.2
+### Added
+
+- Update Wazuh to version [4.3.2](https://github.com/wazuh/wazuh/blob/v4.3.2/CHANGELOG.md#v432)
+
 ## Wazuh Docker v4.3.1
 ### Added
 
@@ -11,6 +16,16 @@ All notable changes to this project will be documented in this file.
 
 - Update Wazuh to version [4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430)
 
+## Wazuh Docker v4.2.7
+### Added
+
+- Update Wazuh to version [4.2.7](https://github.com/wazuh/wazuh/blob/v4.2.7/CHANGELOG.md#v427)
+
+## Wazuh Docker v4.2.6
+### Added
+
+- Update Wazuh to version [4.2.6](https://github.com/wazuh/wazuh/blob/v4.2.6/CHANGELOG.md#v426)
+
 ## Wazuh Docker v4.2.5
 ### Added
 
diff --git a/README.md b/README.md
index ec18839a..a300bda8 100644
--- a/README.md
+++ b/README.md
@@ -193,8 +193,11 @@ WAZUH_MONITORING_REPLICAS=0         #
 
 | Wazuh version | ODFE    | XPACK  |
 |---------------|---------|--------|
+| v4.3.2        |         |        |
 | v4.3.1        |         |        |
 | v4.3.0        |         |        |
+| v4.2.7        | 1.13.2  | 7.11.2 |
+| v4.2.6        | 1.13.2  | 7.11.2 |
 | v4.2.5        | 1.13.2  | 7.11.2 |
 | v4.2.4        | 1.13.2  | 7.11.2 |
 | v4.2.3        | 1.13.2  | 7.11.2 |
diff --git a/VERSION b/VERSION
index 285e4dbc..eecdb527 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="4.3.1"
-REVISION="40311"
+WAZUH-DOCKER_VERSION="4.3.2"
+REVISION="40320"
diff --git a/build-docker-images/docker-compose.yml b/build-docker-images/docker-compose.yml
index e7baf189..25597c37 100644
--- a/build-docker-images/docker-compose.yml
+++ b/build-docker-images/docker-compose.yml
@@ -4,7 +4,7 @@ version: '3.7'
 services:
   wazuh.manager:
     build:  wazuh-manager/
-    image: wazuh/wazuh-manager:4.3.1
+    image: wazuh/wazuh-manager:4.3.2
     hostname: wazuh.manager
     restart: always
     ports:
@@ -32,7 +32,7 @@ services:
 
   wazuh.indexer:
     build: wazuh-indexer/
-    image: wazuh/wazuh-indexer:4.3.1
+    image: wazuh/wazuh-indexer:4.3.2
     hostname: wazuh.indexer
     restart: always
     ports:
@@ -49,7 +49,7 @@ services:
 
   wazuh.dashboard:
     build: wazuh-dashboard/
-    image: wazuh/wazuh-dashboard:4.3.1
+    image: wazuh/wazuh-dashboard:4.3.2
     hostname: wazuh.dashboard
     restart: always
     ports:
diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile
index 6822025a..32bad5f2 100644
--- a/build-docker-images/wazuh-dashboard/Dockerfile
+++ b/build-docker-images/wazuh-dashboard/Dockerfile
@@ -1,7 +1,7 @@
 # Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 FROM ubuntu:focal AS builder
 
-ARG WAZUH_VERSION=4.3.1
+ARG WAZUH_VERSION=4.3.2
 ARG INSTALL_DIR=/usr/share/wazuh-dashboard
 
 # Update and install dependencies
diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh
index 6043789b..f0afb5dd 100644
--- a/build-docker-images/wazuh-indexer/config/config.sh
+++ b/build-docker-images/wazuh-indexer/config/config.sh
@@ -8,7 +8,7 @@ export TARGET_DIR=${CURDIR}/debian/${NAME}
 # Package build options
 export USER=${NAME}
 export GROUP=${NAME}
-export VERSION=4.3.1
+export VERSION=4.3.2
 export LOG_DIR=/var/log/${NAME}
 export LIB_DIR=/var/lib/${NAME}
 export PID_DIR=/run/${NAME}
diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile
index 27b2418b..23e91e1d 100644
--- a/build-docker-images/wazuh-manager/Dockerfile
+++ b/build-docker-images/wazuh-manager/Dockerfile
@@ -1,7 +1,7 @@
 # Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
 FROM ubuntu:focal
 
-ARG WAZUH_VERSION=4.3.1
+ARG WAZUH_VERSION=4.3.2
 ARG TEMPLATE_VERSION=4.3
 ARG FILEBEAT_CHANNEL=filebeat-oss
 ARG FILEBEAT_VERSION=7.10.2
diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml
index e7d77de0..08d2b15e 100644
--- a/multi-node/docker-compose.yml
+++ b/multi-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh.master:
-    image: wazuh/wazuh-manager:4.3.1
+    image: wazuh/wazuh-manager:4.3.2
     hostname: wazuh.master
     restart: always
     ports:
@@ -38,7 +38,7 @@ services:
       - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh.worker:
-    image: wazuh/wazuh-manager:4.3.1
+    image: wazuh/wazuh-manager:4.3.2
     hostname: wazuh.worker
     restart: always
     environment:
@@ -67,7 +67,7 @@ services:
       - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh1.indexer:
-    image: wazuh/wazuh-indexer:4.3.1
+    image: wazuh/wazuh-indexer:4.3.2
     hostname: wazuh1.indexer
     restart: always
     ports:
@@ -93,7 +93,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
 
   wazuh2.indexer:
-    image: wazuh/wazuh-indexer:4.3.1
+    image: wazuh/wazuh-indexer:4.3.2
     hostname: wazuh2.indexer
     restart: always
     environment:
@@ -115,7 +115,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
 
   wazuh3.indexer:
-    image: wazuh/wazuh-indexer:4.3.1
+    image: wazuh/wazuh-indexer:4.3.2
     hostname: wazuh3.indexer
     restart: always
     environment:
@@ -137,7 +137,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.3.1
+    image: wazuh/wazuh-dashboard:4.3.2
     hostname: wazuh.dashboard
     restart: always
     ports:
diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml
index 0a0145a8..d64d2814 100644
--- a/single-node/docker-compose.yml
+++ b/single-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh.manager:
-    image: wazuh/wazuh-manager:4.3.1
+    image: wazuh/wazuh-manager:4.3.2
     hostname: wazuh.manager
     restart: always
     ports:
@@ -39,7 +39,7 @@ services:
       - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh.indexer:
-    image: wazuh/wazuh-indexer:4.3.1
+    image: wazuh/wazuh-indexer:4.3.2
     hostname: wazuh.indexer
     restart: always
     ports:
@@ -64,7 +64,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.3.1
+    image: wazuh/wazuh-dashboard:4.3.2
     hostname: wazuh.dashboard
     restart: always
     ports:

From c22330761e27f41f64ec36dd06c6232fb0346cb3 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Mon, 30 May 2022 10:29:46 -0300
Subject: [PATCH 10/15] bump 4.3.2 version

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index eecdb527..7f9b8a69 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
 WAZUH-DOCKER_VERSION="4.3.2"
-REVISION="40320"
+REVISION="40312"

From 384ed0758431a5d671142f728052ead1c2ec20ef Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Tue, 31 May 2022 10:44:06 -0300
Subject: [PATCH 11/15] bump 4.3.3 version

---
 .github/.goss.yaml                                 |  2 +-
 .github/workflows/push.yml                         |  2 +-
 CHANGELOG.md                                       |  5 +++++
 README.md                                          |  1 +
 VERSION                                            |  4 ++--
 build-docker-images/docker-compose.yml             |  6 +++---
 build-docker-images/wazuh-dashboard/Dockerfile     |  2 +-
 build-docker-images/wazuh-indexer/config/config.sh |  2 +-
 build-docker-images/wazuh-manager/Dockerfile       |  2 +-
 multi-node/docker-compose.yml                      | 12 ++++++------
 single-node/docker-compose.yml                     |  7 +++----
 11 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/.github/.goss.yaml b/.github/.goss.yaml
index 967bba54..759b0c11 100644
--- a/.github/.goss.yaml
+++ b/.github/.goss.yaml
@@ -56,7 +56,7 @@ package:
   wazuh-manager:
     installed: true
     versions:
-    - 4.3.2
+    - 4.3.3
 port:
   tcp:1514:
     listening: true
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index cbc397e0..389ba791 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -25,7 +25,7 @@ jobs:
         version: v0.3.16
 
     - name: Execute Goss tests (wazuh-odfe)
-      run: dgoss run wazuh/wazuh-manager:4.3.2
+      run: dgoss run wazuh/wazuh-manager:4.3.3
       env:
         GOSS_SLEEP: 30
         GOSS_FILE: .github/.goss.yaml
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dddc4d9f..25b6f14c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Wazuh Docker v4.3.3
+### Added
+
+- Update Wazuh to version [4.3.3](https://github.com/wazuh/wazuh/blob/v4.3.3/CHANGELOG.md#v433)
+
 ## Wazuh Docker v4.3.2
 ### Added
 
diff --git a/README.md b/README.md
index 862e6b0c..90647e15 100644
--- a/README.md
+++ b/README.md
@@ -193,6 +193,7 @@ WAZUH_MONITORING_REPLICAS=0         #
 
 | Wazuh version | ODFE    | XPACK  |
 |---------------|---------|--------|
+| v4.3.3        |         |        |
 | v4.3.2        |         |        |
 | v4.3.1        |         |        |
 | v4.3.0        |         |        |
diff --git a/VERSION b/VERSION
index 7f9b8a69..ea37ccb5 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="4.3.2"
-REVISION="40312"
+WAZUH-DOCKER_VERSION="4.3.3"
+REVISION="40313"
diff --git a/build-docker-images/docker-compose.yml b/build-docker-images/docker-compose.yml
index 7c0a1124..e1e0f74f 100644
--- a/build-docker-images/docker-compose.yml
+++ b/build-docker-images/docker-compose.yml
@@ -4,7 +4,7 @@ version: '3.7'
 services:
   wazuh.manager:
     build:  wazuh-manager/
-    image: wazuh/wazuh-manager:4.3.2
+    image: wazuh/wazuh-manager:4.3.3
     hostname: wazuh.manager
     restart: always
     ports:
@@ -32,7 +32,7 @@ services:
 
   wazuh.indexer:
     build: wazuh-indexer/
-    image: wazuh/wazuh-indexer:4.3.2
+    image: wazuh/wazuh-indexer:4.3.3
     hostname: wazuh.indexer
     restart: always
     ports:
@@ -49,7 +49,7 @@ services:
 
   wazuh.dashboard:
     build: wazuh-dashboard/
-    image: wazuh/wazuh-dashboard:4.3.2
+    image: wazuh/wazuh-dashboard:4.3.3
     hostname: wazuh.dashboard
     restart: always
     ports:
diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile
index f2c11d0c..245cee87 100644
--- a/build-docker-images/wazuh-dashboard/Dockerfile
+++ b/build-docker-images/wazuh-dashboard/Dockerfile
@@ -1,7 +1,7 @@
 # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 FROM ubuntu:focal AS builder
 
-ARG WAZUH_VERSION=4.3.2
+ARG WAZUH_VERSION=4.3.3
 ARG INSTALL_DIR=/usr/share/wazuh-dashboard
 
 # Update and install dependencies
diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh
index b878cfbd..7bffca90 100644
--- a/build-docker-images/wazuh-indexer/config/config.sh
+++ b/build-docker-images/wazuh-indexer/config/config.sh
@@ -8,7 +8,7 @@ export TARGET_DIR=${CURDIR}/debian/${NAME}
 # Package build options
 export USER=${NAME}
 export GROUP=${NAME}
-export VERSION=4.3.2
+export VERSION=4.3.3
 export LOG_DIR=/var/log/${NAME}
 export LIB_DIR=/var/lib/${NAME}
 export PID_DIR=/run/${NAME}
diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile
index f5cbb4cb..ed72ba9c 100644
--- a/build-docker-images/wazuh-manager/Dockerfile
+++ b/build-docker-images/wazuh-manager/Dockerfile
@@ -1,7 +1,7 @@
 # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 FROM ubuntu:focal
 
-ARG WAZUH_VERSION=4.3.2
+ARG WAZUH_VERSION=4.3.3
 ARG TEMPLATE_VERSION=4.3
 ARG FILEBEAT_CHANNEL=filebeat-oss
 ARG FILEBEAT_VERSION=7.10.2
diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml
index e141b760..762fc883 100644
--- a/multi-node/docker-compose.yml
+++ b/multi-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh.master:
-    image: wazuh/wazuh-manager:4.3.2
+    image: wazuh/wazuh-manager:4.3.3
     hostname: wazuh.master
     restart: always
     ports:
@@ -38,7 +38,7 @@ services:
       - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh.worker:
-    image: wazuh/wazuh-manager:4.3.2
+    image: wazuh/wazuh-manager:4.3.3
     hostname: wazuh.worker
     restart: always
     environment:
@@ -67,7 +67,7 @@ services:
       - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh1.indexer:
-    image: wazuh/wazuh-indexer:4.3.2
+    image: wazuh/wazuh-indexer:4.3.3
     hostname: wazuh1.indexer
     restart: always
     ports:
@@ -93,7 +93,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
 
   wazuh2.indexer:
-    image: wazuh/wazuh-indexer:4.3.2
+    image: wazuh/wazuh-indexer:4.3.3
     hostname: wazuh2.indexer
     restart: always
     environment:
@@ -115,7 +115,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
 
   wazuh3.indexer:
-    image: wazuh/wazuh-indexer:4.3.2
+    image: wazuh/wazuh-indexer:4.3.3
     hostname: wazuh3.indexer
     restart: always
     environment:
@@ -137,7 +137,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.3.2
+    image: wazuh/wazuh-dashboard:4.3.3
     hostname: wazuh.dashboard
     restart: always
     ports:
diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml
index 07b5c108..30767826 100644
--- a/single-node/docker-compose.yml
+++ b/single-node/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 
 services:
   wazuh.manager:
-    image: wazuh/wazuh-manager:4.3.2
+    image: wazuh/wazuh-manager:4.3.3
     hostname: wazuh.manager
     restart: always
     ports:
@@ -39,7 +39,7 @@ services:
       - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh.indexer:
-    image: wazuh/wazuh-indexer:4.3.2
+    image: wazuh/wazuh-indexer:4.3.3
     hostname: wazuh.indexer
     restart: always
     ports:
@@ -64,8 +64,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.3.2
-    hostname: wazuh.dashboard
+    image: wazuh/wazuh-dashboard:4.3.23
     restart: always
     ports:
       - 443:5601

From af8627b9927a15491a903081604fda28ab700b47 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Tue, 31 May 2022 10:55:09 -0300
Subject: [PATCH 12/15] bump 4.3.3 version

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index ea37ccb5..b5d8eeef 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
 WAZUH-DOCKER_VERSION="4.3.3"
-REVISION="40313"
+REVISION="40314"

From 480f0b7bef8e5a15f0c61188d718985aa9eb4c2f Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Tue, 31 May 2022 15:46:04 -0300
Subject: [PATCH 13/15] bump 4.3.3 version

---
 single-node/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml
index 30767826..d8c9daba 100644
--- a/single-node/docker-compose.yml
+++ b/single-node/docker-compose.yml
@@ -64,7 +64,7 @@ services:
       - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:4.3.23
+    image: wazuh/wazuh-dashboard:4.3.3
     restart: always
     ports:
       - 443:5601

From f220927849570813683f4bc4043721652801a817 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Tue, 31 May 2022 15:57:14 -0300
Subject: [PATCH 14/15] bump 4.3.3 version

---
 single-node/docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml
index d8c9daba..e506deb7 100644
--- a/single-node/docker-compose.yml
+++ b/single-node/docker-compose.yml
@@ -65,6 +65,7 @@ services:
 
   wazuh.dashboard:
     image: wazuh/wazuh-dashboard:4.3.3
+    hostname: wazuh.dashboard
     restart: always
     ports:
       - 443:5601

From 83400ba1e5257d55738f6d65e59ad749d7776084 Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Thu, 2 Jun 2022 10:31:20 -0300
Subject: [PATCH 15/15] bump 4.3.3

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index b5d8eeef..f675ddc8 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
 WAZUH-DOCKER_VERSION="4.3.3"
-REVISION="40314"
+REVISION="40315"