From 4d5255313e02c3ac5cfea2d4805d328d76fc45f7 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Mon, 19 Jan 2026 20:12:54 +0700
Subject: [PATCH 1/6] Add IMAGE_TAG stage reference

---
 build-docker-images/build-images.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh
index 1a0802fc..149dfa63 100755
--- a/build-docker-images/build-images.sh
+++ b/build-docker-images/build-images.sh
@@ -60,7 +60,14 @@ build() {
             curl -fsSL -o "$ARTIFACT_URLS_FILE" "https://packages-dev.wazuh.com/${WAZUH_MINOR_VERSION}/${ARTIFACT_URLS_FILE}"
         fi
     fi
+    
     awk -F':' '{name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=" val}' $ARTIFACT_URLS_FILE > artifacts_env.txt
+    
+    if  [ "${WAZUH_DEV_STAGE}" ];then
+        IMAGE_TAG="${WAZUH_IMAGE_VERSION}-${WAZUH_DEV_STAGE,,}"
+    else
+        IMAGE_TAG="${WAZUH_IMAGE_VERSION}"
+    fi
 
     echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > ../.env
     echo WAZUH_IMAGE_VERSION=$WAZUH_IMAGE_VERSION >> ../.env

From bc8c42920b2014389befa0cef9de76cdb522b5ae Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Mon, 19 Jan 2026 21:01:32 +0700
Subject: [PATCH 2/6] Change IMAGE_TAG dev reference

---
 .github/workflows/Procedure_push_docker_images.yml | 6 +++++-
 build-docker-images/build-images.sh                | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml
index 235cab02..86325493 100644
--- a/.github/workflows/Procedure_push_docker_images.yml
+++ b/.github/workflows/Procedure_push_docker_images.yml
@@ -164,7 +164,11 @@ jobs:
             fi
             DEV_STAGE=${tokens[1]}
             WAZUH_VER=${tokens[0]}
-            ./build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -rg $IMAGE_REGISTRY -m
+            if [ "${{ inputs.dev }}" = true ]; then
+              ./build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -rg $IMAGE_REGISTRY -m -ref ${{ inputs.reference }}
+            else 
+              ./build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -rg $IMAGE_REGISTRY -m
+            fi
           else
             ./build-images.sh -v $IMAGE_TAG -r $REVISION -rg $IMAGE_REGISTRY -m
           fi
diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh
index 149dfa63..78ae030f 100755
--- a/build-docker-images/build-images.sh
+++ b/build-docker-images/build-images.sh
@@ -64,7 +64,11 @@ build() {
     awk -F':' '{name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=" val}' $ARTIFACT_URLS_FILE > artifacts_env.txt
     
     if  [ "${WAZUH_DEV_STAGE}" ];then
-        IMAGE_TAG="${WAZUH_IMAGE_VERSION}-${WAZUH_DEV_STAGE,,}"
+        if  [ "${WAZUH_DEV_STAGE}" ];then
+            IMAGE_TAG="${WAZUH_IMAGE_VERSION}-${WAZUH_DEV_STAGE,,}-${WAZUH_TAG_REFERENCE}"   
+        else
+            IMAGE_TAG="${WAZUH_IMAGE_VERSION}-${WAZUH_DEV_STAGE,,}"
+        fi
     else
         IMAGE_TAG="${WAZUH_IMAGE_VERSION}"
     fi

From f78e8f51273e1185d43c3b3ace68815278c842db Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Mon, 19 Jan 2026 21:02:05 +0700
Subject: [PATCH 3/6] Change IMAGE_TAG dev reference

---
 build-docker-images/build-images.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh
index 78ae030f..a7c381ce 100755
--- a/build-docker-images/build-images.sh
+++ b/build-docker-images/build-images.sh
@@ -64,7 +64,7 @@ build() {
     awk -F':' '{name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=" val}' $ARTIFACT_URLS_FILE > artifacts_env.txt
     
     if  [ "${WAZUH_DEV_STAGE}" ];then
-        if  [ "${WAZUH_DEV_STAGE}" ];then
+        if  [ "${WAZUH_TAG_REFERENCE}" ];then
             IMAGE_TAG="${WAZUH_IMAGE_VERSION}-${WAZUH_DEV_STAGE,,}-${WAZUH_TAG_REFERENCE}"   
         else
             IMAGE_TAG="${WAZUH_IMAGE_VERSION}-${WAZUH_DEV_STAGE,,}"

From fbd5140c842a50e1e115cb8a955374a29c879091 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Mon, 19 Jan 2026 21:50:38 +0700
Subject: [PATCH 4/6] Change IMAGE_TAG dev reference

---
 .../Procedure_push_docker_images.yml          | 33 ++++++++-----------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml
index 86325493..b8661b46 100644
--- a/.github/workflows/Procedure_push_docker_images.yml
+++ b/.github/workflows/Procedure_push_docker_images.yml
@@ -152,26 +152,21 @@ jobs:
 
     - name: Build Wazuh images
       run: |
-        if [ "${{ inputs.dev }}" = true ]; then
-          IMAGE_TAG="${{ inputs.image_tag }}-${{ inputs.reference }}"
-          ./build-images.sh -v ${{ inputs.image_tag }} -r $REVISION -d "dev" -rg $IMAGE_REGISTRY -m -ref ${{ inputs.reference }}
-        else
-          if [[ "$IMAGE_TAG" == *"-"* ]]; then
-            IFS='-' read -r -a tokens <<< "$IMAGE_TAG"
-            if [ -z "${tokens[1]}" ]; then
-              echo "Invalid image tag: $IMAGE_TAG"
-              exit 1
-            fi
-            DEV_STAGE=${tokens[1]}
-            WAZUH_VER=${tokens[0]}
-            if [ "${{ inputs.dev }}" = true ]; then
-              ./build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -rg $IMAGE_REGISTRY -m -ref ${{ inputs.reference }}
-            else 
-              ./build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -rg $IMAGE_REGISTRY -m
-            fi
-          else
-            ./build-images.sh -v $IMAGE_TAG -r $REVISION -rg $IMAGE_REGISTRY -m
+        if [[ "$IMAGE_TAG" == *"-"* ]]; then
+          IFS='-' read -r -a tokens <<< "$IMAGE_TAG"
+          if [ -z "${tokens[1]}" ]; then
+            echo "Invalid image tag: $IMAGE_TAG"
+            exit 1
           fi
+          DEV_STAGE=${tokens[1]}
+          WAZUH_VER=${tokens[0]}
+          if [ "${{ inputs.dev }}" = true ]; then
+            ./build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -rg $IMAGE_REGISTRY -m -ref ${{ inputs.reference }}
+          else 
+            ./build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -rg $IMAGE_REGISTRY -m
+          fi
+        else
+          ./build-images.sh -v $IMAGE_TAG -r $REVISION -rg $IMAGE_REGISTRY -m
         fi
         # Save .env file (generated by build-images.sh) contents to $GITHUB_ENV
         ENV_FILE_PATH="../.env"

From 914a6c44ec712b5fad6cd395560079f9f8563950 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Mon, 19 Jan 2026 22:36:36 +0700
Subject: [PATCH 5/6] Add Changelog

---
 .env         | 4 ++--
 CHANGELOG.md | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index 2146280d..cb7e2df8 100755
--- a/.env
+++ b/.env
@@ -2,5 +2,5 @@ WAZUH_VERSION=5.0.0
 WAZUH_IMAGE_VERSION=5.0.0
 WAZUH_TAG_REVISION=1
 WAZUH_UI_REVISION=1
-WAZUH_REGISTRY=docker.io
-IMAGE_TAG=5.0.0
+WAZUH_REGISTRY=966237403726.dkr.ecr.us-west-1.amazonaws.com
+IMAGE_TAG=5.0.0-rc1-latest
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ad8b868..33b32dc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+- Add IMAGE_TAG stage reference ([#2176](https://github.com/wazuh/wazuh-docker/pull/2176))
 - Delete Wazuh agent configuration files ([#2173](https://github.com/wazuh/wazuh-docker/pull/2173))
 - Modify run_as parameter value - main ([#2158](https://github.com/wazuh/wazuh-docker/pull/2158))
 - Change macOS and Windows deployment documentation ([#2150](https://github.com/wazuh/wazuh-docker/issues/2150))

From 80893ba051b02575d46f6c243c697b7a12b02aa9 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Mon, 19 Jan 2026 23:07:51 +0700
Subject: [PATCH 6/6] Add Changelog

---
 .env         | 4 ++--
 CHANGELOG.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index cb7e2df8..2146280d 100755
--- a/.env
+++ b/.env
@@ -2,5 +2,5 @@ WAZUH_VERSION=5.0.0
 WAZUH_IMAGE_VERSION=5.0.0
 WAZUH_TAG_REVISION=1
 WAZUH_UI_REVISION=1
-WAZUH_REGISTRY=966237403726.dkr.ecr.us-west-1.amazonaws.com
-IMAGE_TAG=5.0.0-rc1-latest
+WAZUH_REGISTRY=docker.io
+IMAGE_TAG=5.0.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33b32dc8..9d1e1153 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-- Add IMAGE_TAG stage reference ([#2176](https://github.com/wazuh/wazuh-docker/pull/2176))
+- Add IMAGE_TAG stage reference ([#2178](https://github.com/wazuh/wazuh-docker/pull/2178))
 - Delete Wazuh agent configuration files ([#2173](https://github.com/wazuh/wazuh-docker/pull/2173))
 - Modify run_as parameter value - main ([#2158](https://github.com/wazuh/wazuh-docker/pull/2158))
 - Change macOS and Windows deployment documentation ([#2150](https://github.com/wazuh/wazuh-docker/issues/2150))