diff --git a/build-docker-images/wazuh-agent/Dockerfile b/build-docker-images/wazuh-agent/Dockerfile
index 6239d179..d68e3539 100644
--- a/build-docker-images/wazuh-agent/Dockerfile
+++ b/build-docker-images/wazuh-agent/Dockerfile
@@ -27,10 +27,8 @@ RUN RPM_ARCH="x86_64" && \
     sed -i '/<authorization_pass_path>/d' /var/ossec/etc/ossec.conf
 
 # Download tini static binary (no external library dependencies)
-RUN TINI_ARCH="amd64" && \
-    if [ "${TARGETARCH}" = "arm64" ]; then TINI_ARCH="arm64"; fi && \
-    curl --fail --silent -L \
-    https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-${TINI_ARCH} \
+RUN curl --fail --silent -L \
+    https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-${TARGETARCH} \
     -o /usr/local/bin/tini && \
     chmod +x /usr/local/bin/tini
 
diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile
index 5ef48c2d..35adb246 100644
--- a/build-docker-images/wazuh-manager/Dockerfile
+++ b/build-docker-images/wazuh-manager/Dockerfile
@@ -42,10 +42,8 @@ RUN chmod 755 /permanent_data.sh && \
     sync && rm /permanent_data.sh
 
 # Download tini static binary (no external library dependencies)
-RUN TINI_ARCH="amd64" && \
-    if [ "${TARGETARCH}" = "arm64" ]; then TINI_ARCH="arm64"; fi && \
-    curl --fail --silent -L \
-    https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-${TINI_ARCH} \
+RUN curl --fail --silent -L \
+    https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-${TARGETARCH} \
     -o /usr/local/bin/tini && \
     chmod +x /usr/local/bin/tini