diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69991045..d81feffa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+- Agent group parameter added ([#2127](https://github.com/wazuh/wazuh-docker/pull/2127))
 - Adapt to multi architecture build ([#2120](https://github.com/wazuh/wazuh-docker/pull/2120))
 
 ### Fixed
diff --git a/build-docker-images/wazuh-agent/Dockerfile b/build-docker-images/wazuh-agent/Dockerfile
index 8a237787..242ca8a3 100644
--- a/build-docker-images/wazuh-agent/Dockerfile
+++ b/build-docker-images/wazuh-agent/Dockerfile
@@ -10,7 +10,8 @@ ARG WAZUH_MANAGER='CHANGE_MANAGER_IP'
 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='CHANGEE_AGENT_NAME'
+ARG WAZUH_AGENT_NAME='CHANGE_AGENT_NAME'
+ARG WAZUH_AGENT_GROUPS='CHANGE_AGENT_GROUPS'
 
 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 2fcf4a88..a50b4662 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,6 +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"}
 
 ##############################################################################
 # Aux functions
@@ -66,7 +67,8 @@ set_manager_conn() {
   sed -i "s#<port>CHANGE_MANAGER_PORT</port>#<port>$WAZUH_MANAGER_PORT</port>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
   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>CHANGEE_AGENT_NAME</agent_name>#<agent_name>$WAZUH_AGENT_NAME</agent_name>#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
   [ -n "$WAZUH_REGISTRATION_PASSWORD" ] && \
   echo "$WAZUH_REGISTRATION_PASSWORD" > ${WAZUH_INSTALL_PATH}/etc/authd.pass && \
   chown root:wazuh ${WAZUH_INSTALL_PATH}/etc/authd.pass && \
diff --git a/docs/ref/configuration/environment-variables.md b/docs/ref/configuration/environment-variables.md
index 003ad165..eac90d9e 100644
--- a/docs/ref/configuration/environment-variables.md
+++ b/docs/ref/configuration/environment-variables.md
@@ -4,11 +4,14 @@ This document outlines the environment variables applicable to the Wazuh Docker
 
 ## Table of Contents
 
-- [Wazuh Manager](#wazuh-manager)
-- [Wazuh Indexer](#wazuh-indexer)
-- [Wazuh Dashboard](#wazuh-dashboard)
-- [Wazuh Agent](#wazuh-agent)
-- [Overriding Configuration Files with Environment Variables](#overriding-configuration-files-with-environment-variables)
+- [Environment Variables in Wazuh Docker Deployment](#environment-variables-in-wazuh-docker-deployment)
+  - [Table of Contents](#table-of-contents)
+  - [Wazuh Manager](#wazuh-manager)
+  - [Wazuh Indexer](#wazuh-indexer)
+  - [Wazuh Dashboard](#wazuh-dashboard)
+  - [Wazuh Agent](#wazuh-agent)
+  - [Overriding Configuration Files with Environment Variables](#overriding-configuration-files-with-environment-variables)
+    - [Examples:](#examples)
 
 ---
 
@@ -88,6 +91,7 @@ environment:
   - WAZUH_REGISTRATION_SERVER=wazuh.manager
   - WAZUH_REGISTRATION_PORT=1515
   - WAZUH_AGENT_NAME=my-agent
+  - WAZUH_AGENT_GROUPS=default
   - WAZUH_REGISTRATION_PASSWORD=StrongPassword
 ```
 
diff --git a/wazuh-agent/config/wazuh-agent-conf b/wazuh-agent/config/wazuh-agent-conf
index 51fd9b0f..ad0d8ece 100644
--- a/wazuh-agent/config/wazuh-agent-conf
+++ b/wazuh-agent/config/wazuh-agent-conf
@@ -20,8 +20,9 @@
       <enabled>yes</enabled>
       <manager_address>CHANGE_ENROLL_IP</manager_address>
       <port>CHANGE_ENROLL_PORT</port>
-      <agent_name>CHANGEE_AGENT_NAME</agent_name>
+      <agent_name>CHANGE_AGENT_NAME</agent_name>
       <authorization_pass_path>etc/authd.pass</authorization_pass_path>
+      <groups>CHANGE_AGENT_GROUPS</groups>
     </enrollment>
   </client>