diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh
index 50890e2d..6b7596ce 100755
--- a/build-docker-images/build-images.sh
+++ b/build-docker-images/build-images.sh
@@ -132,31 +132,31 @@ build() {
         case "${component}" in
             wazuh-indexer)
                 build_args+=(
-                    --build-arg wazuh_indexer_url_amd64_rpm="${wazuh_indexer_url_x86_64_rpm}"
-                    --build-arg wazuh_indexer_url_arm64_rpm="${wazuh_indexer_url_aarch64_rpm}"
+                    --build-arg wazuh_indexer_amd64_rpm="${wazuh_indexer_amd64_rpm}"
+                    --build-arg wazuh_indexer_arm64_rpm="${wazuh_indexer_arm64_rpm}"
                     --build-arg wazuh_certs_tool="${wazuh_certs_tool}"
                     --build-arg wazuh_config_yml="${wazuh_config_yml}"
                 )
                 ;;
             wazuh-manager)
                 build_args+=(
-                    --build-arg wazuh_manager_url_amd64_rpm="${wazuh_manager_url_x86_64_rpm}"
-                    --build-arg wazuh_manager_url_arm64_rpm="${wazuh_manager_url_aarch64_rpm}"
+                    --build-arg wazuh_manager_amd64_rpm="${wazuh_manager_amd64_rpm}"
+                    --build-arg wazuh_manager_arm64_rpm="${wazuh_manager_arm64_rpm}"
                 )
                 ;;
             wazuh-dashboard)
                 build_args+=(
                     --build-arg WAZUH_UI_REVISION="${WAZUH_UI_REVISION}"
-                    --build-arg wazuh_dashboard_url_amd64_rpm="${wazuh_dashboard_url_x86_64_rpm}"
-                    --build-arg wazuh_dashboard_url_arm64_rpm="${wazuh_dashboard_url_aarch64_rpm}"
+                    --build-arg wazuh_dashboard_amd64_rpm="${wazuh_dashboard_amd64_rpm}"
+                    --build-arg wazuh_dashboard_arm64_rpm="${wazuh_dashboard_arm64_rpm}"
                     --build-arg wazuh_certs_tool="${wazuh_certs_tool}"
                     --build-arg wazuh_config_yml="${wazuh_config_yml}"
                 )
                 ;;
             wazuh-agent)
                 build_args+=(
-                    --build-arg wazuh_agent_url_amd64_rpm="${wazuh_agent_url_x86_64_rpm}"
-                    --build-arg wazuh_agent_url_arm64_rpm="${wazuh_agent_url_aarch64_rpm}"
+                    --build-arg wazuh_agent_amd64_rpm="${wazuh_agent_amd64_rpm}"
+                    --build-arg wazuh_agent_arm64_rpm="${wazuh_agent_arm64_rpm}"
                 )
                 ;;
         esac
diff --git a/build-docker-images/build-images.yml b/build-docker-images/build-images.yml
index 15397156..e0544df0 100644
--- a/build-docker-images/build-images.yml
+++ b/build-docker-images/build-images.yml
@@ -6,8 +6,8 @@ services:
       args:
         WAZUH_VERSION: ${WAZUH_VERSION}
         WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
-        wazuh_manager_url_amd64_rpm: ${wazuh_manager_url_x86_64_rpm}
-        wazuh_manager_url_arm64_rpm: ${wazuh_manager_url_aarch64_rpm}
+        wazuh_manager_amd64_rpm: ${wazuh_manager_amd64_rpm}
+        wazuh_manager_arm64_rpm: ${wazuh_manager_arm64_rpm}
         wazuh_certs_tool: ${wazuh_certs_tool}
         wazuh_config_yml: ${wazuh_config_yml}
     image: ${WAZUH_REGISTRY}/wazuh/wazuh-manager:${IMAGE_TAG}
@@ -37,8 +37,8 @@ services:
       args:
         WAZUH_VERSION: ${WAZUH_VERSION}
         WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
-        wazuh_agent_url_amd64_rpm: ${wazuh_agent_url_x86_64_rpm}
-        wazuh_agent_url_arm64_rpm: ${wazuh_agent_url_aarch64_rpm}
+        wazuh_agent_amd64_rpm: ${wazuh_agent_amd64_rpm}
+        wazuh_agent_arm64_rpm: ${wazuh_agent_arm64_rpm}
     image: ${WAZUH_REGISTRY}/wazuh/wazuh-agent:${IMAGE_TAG}
     hostname: wazuh.agent
     restart: always
@@ -49,8 +49,8 @@ services:
       args:
         WAZUH_VERSION: ${WAZUH_VERSION}
         WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
-        wazuh_indexer_url_amd64_rpm: ${wazuh_indexer_url_x86_64_rpm}
-        wazuh_indexer_url_arm64_rpm: ${wazuh_indexer_url_aarch64_rpm}
+        wazuh_indexer_amd64_rpm: ${wazuh_indexer_amd64_rpm}
+        wazuh_indexer_arm64_rpm: ${wazuh_indexer_arm64_rpm}
         wazuh_certs_tool: ${wazuh_certs_tool}
         wazuh_config_yml: ${wazuh_config_yml}
     image: ${WAZUH_REGISTRY}/wazuh/wazuh-indexer:${IMAGE_TAG}
@@ -75,8 +75,8 @@ services:
         WAZUH_VERSION: ${WAZUH_VERSION}
         WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
         WAZUH_UI_REVISION: ${WAZUH_UI_REVISION}
-        wazuh_dashboard_url_amd64_rpm: ${wazuh_dashboard_url_x86_64_rpm}
-        wazuh_dashboard_url_arm64_rpm: ${wazuh_dashboard_url_aarch64_rpm}
+        wazuh_dashboard_amd64_rpm: ${wazuh_dashboard_amd64_rpm}
+        wazuh_dashboard_arm64_rpm: ${wazuh_dashboard_arm64_rpm}
         wazuh_certs_tool: ${wazuh_certs_tool}
         wazuh_config_yml: ${wazuh_config_yml}
     image: ${WAZUH_REGISTRY}/wazuh/wazuh-dashboard:${IMAGE_TAG}
diff --git a/build-docker-images/wazuh-agent/Dockerfile b/build-docker-images/wazuh-agent/Dockerfile
index e5394b70..7abdad3d 100644
--- a/build-docker-images/wazuh-agent/Dockerfile
+++ b/build-docker-images/wazuh-agent/Dockerfile
@@ -13,10 +13,10 @@ ARG WAZUH_REGISTRATION_PORT='CHANGE_ENROLL_PORT'
 ARG WAZUH_AGENT_NAME='CHANGE_AGENT_NAME'
 ARG WAZUH_AGENT_GROUPS='CHANGE_AGENT_GROUPS'
 ARG TARGETARCH
-ARG wazuh_agent_url_amd64_rpm
-ARG wazuh_agent_url_arm64_rpm
+ARG wazuh_agent_amd64_rpm
+ARG wazuh_agent_arm64_rpm
 
-RUN URL_VAR="wazuh_agent_url_${TARGETARCH}_rpm" && \
+RUN URL_VAR="wazuh_agent_${TARGETARCH}_rpm" && \
     agent_url="${!URL_VAR}" && \
     dnf install curl-minimal tar gzip procps -y &&\
     curl -o /wazuh-agent.rpm "${agent_url}" && \
diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile
index 1a8e6955..bef9cabf 100644
--- a/build-docker-images/wazuh-dashboard/Dockerfile
+++ b/build-docker-images/wazuh-dashboard/Dockerfile
@@ -6,12 +6,12 @@ ARG WAZUH_TAG_REVISION
 ARG WAZUH_UI_REVISION
 ARG INSTALL_DIR=/usr/share/wazuh-dashboard
 ARG TARGETARCH
-ARG wazuh_dashboard_url_amd64_rpm
-ARG wazuh_dashboard_url_arm64_rpm
+ARG wazuh_dashboard_amd64_rpm
+ARG wazuh_dashboard_arm64_rpm
 ARG wazuh_config_yml
 
 # Update and install dependencies
-RUN URL_VAR="wazuh_dashboard_url_${TARGETARCH}_rpm" && \
+RUN URL_VAR="wazuh_dashboard_${TARGETARCH}_rpm" && \
     dashboard_url="${!URL_VAR}" && \
     dnf install curl-minimal libcap openssl -y && \
     curl -o /wazuh-dashboard.rpm "${dashboard_url}" && \
diff --git a/build-docker-images/wazuh-indexer/Dockerfile b/build-docker-images/wazuh-indexer/Dockerfile
index ae16f38d..a3801e22 100644
--- a/build-docker-images/wazuh-indexer/Dockerfile
+++ b/build-docker-images/wazuh-indexer/Dockerfile
@@ -4,14 +4,14 @@ FROM amazonlinux:2023 AS builder
 ARG WAZUH_VERSION
 ARG WAZUH_TAG_REVISION
 ARG TARGETARCH
-ARG wazuh_indexer_url_amd64_rpm
-ARG wazuh_indexer_url_arm64_rpm
+ARG wazuh_indexer_amd64_rpm
+ARG wazuh_indexer_arm64_rpm
 ARG wazuh_certs_tool
 ARG wazuh_config_yml
 
 COPY config/config.sh .
 
-RUN URL_VAR="wazuh_indexer_url_${TARGETARCH}_rpm" && \
+RUN URL_VAR="wazuh_indexer_${TARGETARCH}_rpm" && \
     indexer_url="${!URL_VAR}" && \
     dnf install curl-minimal openssl xz tar findutils shadow-utils -y &&\
     curl -o /wazuh-indexer.rpm "${indexer_url}" && \
diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile
index e6898a49..6051ad2c 100644
--- a/build-docker-images/wazuh-manager/Dockerfile
+++ b/build-docker-images/wazuh-manager/Dockerfile
@@ -7,10 +7,10 @@ ARG WAZUH_VERSION
 ARG WAZUH_TAG_REVISION
 ARG S6_VERSION="v2.2.0.3"
 ARG TARGETARCH
-ARG wazuh_manager_url_amd64_rpm
-ARG wazuh_manager_url_arm64_rpm
+ARG wazuh_manager_amd64_rpm
+ARG wazuh_manager_arm64_rpm
 
-RUN URL_VAR="wazuh_manager_url_${TARGETARCH}_rpm" && \
+RUN URL_VAR="wazuh_manager_${TARGETARCH}_rpm" && \
     manager_url="${!URL_VAR}" && \
     dnf install curl-minimal xz gnupg tar gzip openssl findutils procps -y &&\
     dnf clean all && \