diff --git a/build-docker-images/wazuh-agent/Dockerfile b/build-docker-images/wazuh-agent/Dockerfile
index 7cb8ea35..da45f1ce 100644
--- a/build-docker-images/wazuh-agent/Dockerfile
+++ b/build-docker-images/wazuh-agent/Dockerfile
@@ -36,8 +36,7 @@ RUN dnf install procps shadow-utils -y && \
     curl -o /wazuh-agent.rpm "${agent_url}" && \
     dnf install /wazuh-agent.rpm -y && \
     rm -rf /wazuh-agent.rpm && \
-    dnf clean all && \
-    sed -i '/<authorization_pass_path>/d' /var/ossec/etc/ossec.conf
+    dnf clean all
 
 # Download tini static binary (no external library dependencies)
 RUN curl --fail --silent -L \
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 c7802236..f9efca25 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
@@ -62,6 +62,15 @@ set_manager_conn() {
   sed -i "s#<address>CHANGE_MANAGER_IP</address>#<address>$WAZUH_MANAGER_SERVER</address>#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#<agent_name>CHANGE_AGENT_NAME</agent_name>#<agent_name>$WAZUH_AGENT_NAME</agent_name>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
+  if [ -n "$WAZUH_REGISTRATION_PASSWORD" ]; then
+    set +x
+    cat << EOF > /var/ossec/etc/authd.pass
+$WAZUH_REGISTRATION_PASSWORD
+EOF
+    set -x
+  else
+    echo "WAZUH_REGISTRATION_PASSWORD is not set; the authd.pass configuration is omitted."
+  fi
 }
 
 ##############################################################################
diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile
index 40c287ef..6a004691 100644
--- a/build-docker-images/wazuh-dashboard/Dockerfile
+++ b/build-docker-images/wazuh-dashboard/Dockerfile
@@ -46,8 +46,7 @@ RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/bin/node
 
 ################################################################################
 # Build stage 1 (the current Wazuh dashboard image):
-#
-# Copy wazuh-dashboard from stage 0
+# Copy wazuh-dashboard from builder
 # Add entrypoint
 # Add wazuh_dashboard_config
 ################################################################################
diff --git a/build-docker-images/wazuh-indexer/Dockerfile b/build-docker-images/wazuh-indexer/Dockerfile
index 80c528e3..3d2c4758 100644
--- a/build-docker-images/wazuh-indexer/Dockerfile
+++ b/build-docker-images/wazuh-indexer/Dockerfile
@@ -41,8 +41,7 @@ RUN yum install curl-minimal shadow-utils findutils hostname -y && \
 
 ################################################################################
 # Build stage 1 (the actual Wazuh indexer image):
-#
-# Copy wazuh-indexer from stage 0
+# Copy wazuh-indexer from builder
 # Add entrypoint
 ################################################################################
 FROM amazonlinux:2023
diff --git a/wazuh-agent/docker-compose.yml b/wazuh-agent/docker-compose.yml
index 842677e1..303f1ca3 100644
--- a/wazuh-agent/docker-compose.yml
+++ b/wazuh-agent/docker-compose.yml
@@ -5,3 +5,4 @@ services:
     restart: always
     environment:
       - WAZUH_MANAGER_SERVER=<WAZUH_MANAGER_IP>
+      - WAZUH_REGISTRATION_PASSWORD=<authd.pass-PASSWORD>