From 0625d0464edc8d05987481dc6009e5c9c383439c Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Thu, 19 Mar 2026 17:23:36 +0700
Subject: [PATCH 1/3] Fix WAZUH_AGENT_GROUP variable

---
 build-docker-images/wazuh-agent/Dockerfile                    | 2 +-
 .../wazuh-agent/config/etc/cont-init.d/0-wazuh-init           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-docker-images/wazuh-agent/Dockerfile b/build-docker-images/wazuh-agent/Dockerfile
index 8b5278d2..dd2a9657 100644
--- a/build-docker-images/wazuh-agent/Dockerfile
+++ b/build-docker-images/wazuh-agent/Dockerfile
@@ -11,7 +11,7 @@ ARG WAZUH_MANAGER_PORT='CHANGE_MANAGER_PORT'
 ARG WAZUH_REGISTRATION_SERVER='CHANGE_ENROLL_IP'
 ARG WAZUH_REGISTRATION_PORT='CHANGE_ENROLL_PORT'
 ARG WAZUH_AGENT_NAME='CHANGE_AGENT_NAME'
-ARG WAZUH_AGENT_GROUPS='CHANGE_AGENT_GROUPS'
+ARG WAZUH_AGENT_GROUP='CHANGE_AGENT_GROUP'
 ARG TARGETARCH
 
 COPY config/check_repository.sh /
diff --git a/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init b/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init
index a50b4662..d2fc8d17 100644
--- a/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init
+++ b/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init
@@ -9,7 +9,7 @@ WAZUH_REGISTRATION_SERVER=${WAZUH_REGISTRATION_SERVER:-$WAZUH_MANAGER_SERVER}
 WAZUH_REGISTRATION_PORT=${WAZUH_REGISTRATION_PORT:-"1515"}
 WAZUH_REGISTRATION_PASSWORD=$WAZUH_REGISTRATION_PASSWORD
 WAZUH_AGENT_NAME=${WAZUH_AGENT_NAME:-"wazuh-agent-$HOSTNAME"}
-WAZUH_AGENT_GROUPS=${WAZUH_AGENT_GROUPS:-"default"}
+WAZUH_AGENT_GROUP=${WAZUH_AGENT_GROUP:-"default"}
 
 ##############################################################################
 # Aux functions
@@ -68,7 +68,7 @@ set_manager_conn() {
   sed -i "s#<manager_address>CHANGE_ENROLL_IP</manager_address>#<manager_address>$WAZUH_REGISTRATION_SERVER</manager_address>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
   sed -i "s#<port>CHANGE_ENROLL_PORT</port>#<port>$WAZUH_REGISTRATION_PORT</port>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
   sed -i "s#<agent_name>CHANGE_AGENT_NAME</agent_name>#<agent_name>$WAZUH_AGENT_NAME</agent_name>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
-  sed -i "s#<groups>CHANGE_AGENT_GROUPS</groups>#<groups>$WAZUH_AGENT_GROUPS</groups>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
+  sed -i "s#<groups>CHANGE_AGENT_GROUP</groups>#<groups>$WAZUH_AGENT_GROUP</groups>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
   [ -n "$WAZUH_REGISTRATION_PASSWORD" ] && \
   echo "$WAZUH_REGISTRATION_PASSWORD" > ${WAZUH_INSTALL_PATH}/etc/authd.pass && \
   chown root:wazuh ${WAZUH_INSTALL_PATH}/etc/authd.pass && \

From ddd2f897175a104a6a773e47742ee10e417d1115 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Thu, 19 Mar 2026 17:26:01 +0700
Subject: [PATCH 2/3] Fix CHANGE_AGENT_GROUP parameter

---
 docs/ref/configuration/environment-variables.md | 2 +-
 wazuh-agent/config/wazuh-agent-conf             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ref/configuration/environment-variables.md b/docs/ref/configuration/environment-variables.md
index eac90d9e..fe889ee8 100644
--- a/docs/ref/configuration/environment-variables.md
+++ b/docs/ref/configuration/environment-variables.md
@@ -91,7 +91,7 @@ environment:
   - WAZUH_REGISTRATION_SERVER=wazuh.manager
   - WAZUH_REGISTRATION_PORT=1515
   - WAZUH_AGENT_NAME=my-agent
-  - WAZUH_AGENT_GROUPS=default
+  - WAZUH_AGENT_GROUP=default
   - WAZUH_REGISTRATION_PASSWORD=StrongPassword
 ```
 
diff --git a/wazuh-agent/config/wazuh-agent-conf b/wazuh-agent/config/wazuh-agent-conf
index ad0d8ece..24cfda7e 100644
--- a/wazuh-agent/config/wazuh-agent-conf
+++ b/wazuh-agent/config/wazuh-agent-conf
@@ -22,7 +22,7 @@
       <port>CHANGE_ENROLL_PORT</port>
       <agent_name>CHANGE_AGENT_NAME</agent_name>
       <authorization_pass_path>etc/authd.pass</authorization_pass_path>
-      <groups>CHANGE_AGENT_GROUPS</groups>
+      <groups>CHANGE_AGENT_GROUP</groups>
     </enrollment>
   </client>
 

From 94f88baab219dff30621e1c7f1031297fbabe5a2 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Thu, 19 Mar 2026 17:42:39 +0700
Subject: [PATCH 3/3] Add changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 829e742c..9b04a2af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
-- None
+- Fix WAZUH_AGENT_GROUP variable ([#2262](https://github.com/wazuh/wazuh-docker/pull/2262))
 
 ### Deleted