From e181132921242fab5195c6a91ed1cf98bef28af2 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Tue, 9 Jun 2026 01:51:42 +0700
Subject: [PATCH 01/24] PR revamp modifications

---
 ...images.yml => 4_build_and_push_images.yml} |  6 +-
 .../workflows/{push.yml => 4_pr_check.yml}    | 11 ++-
 .github/workflows/trivy-dashboard.yml         | 76 -------------------
 .github/workflows/trivy-indexer.yml           | 76 -------------------
 .github/workflows/trivy-manager.yml           | 76 -------------------
 5 files changed, 12 insertions(+), 233 deletions(-)
 rename .github/workflows/{Procedure_push_docker_images.yml => 4_build_and_push_images.yml} (98%)
 rename .github/workflows/{push.yml => 4_pr_check.yml} (98%)
 delete mode 100644 .github/workflows/trivy-dashboard.yml
 delete mode 100644 .github/workflows/trivy-indexer.yml
 delete mode 100644 .github/workflows/trivy-manager.yml

diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/4_build_and_push_images.yml
similarity index 98%
rename from .github/workflows/Procedure_push_docker_images.yml
rename to .github/workflows/4_build_and_push_images.yml
index 3dc541f2..afef0da3 100644
--- a/.github/workflows/Procedure_push_docker_images.yml
+++ b/.github/workflows/4_build_and_push_images.yml
@@ -1,5 +1,5 @@
-run-name: Launch Push Docker Images - ${{ inputs.id }}
-name: Push Docker Images
+run-name: Build and push images 4.x - ${{ inputs.dev && 'dev' || 'release' }} - ${{ inputs.id }}
+name: Build and push images 4.x
 
 on:
   workflow_dispatch:
@@ -92,7 +92,7 @@ jobs:
     - name: Print inputs
       run: |
         echo "---------------------------------------------"
-        echo "Running Procedure_push_docker_images workflow"
+        echo "Running 4_build_and_push_images workflow"
         echo "---------------------------------------------"
         echo "* BRANCH: ${{ github.ref }}"
         echo "* COMMIT: ${{ github.sha }}"
diff --git a/.github/workflows/push.yml b/.github/workflows/4_pr_check.yml
similarity index 98%
rename from .github/workflows/push.yml
rename to .github/workflows/4_pr_check.yml
index 684a4ec5..a7b7f344 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/4_pr_check.yml
@@ -1,6 +1,13 @@
-name: Wazuh Docker pipeline
+name: Wazuh Docker pipeline 4.x
 
-on: [pull_request]
+on:
+  pull_request:
+    paths:
+      - 'build-docker-images/**'
+      - 'multi-node/**'
+      - 'single-node/**'
+      - 'wazuh-agent/**'
+      - '.github/**'
 
 jobs:
   build-docker-images:
diff --git a/.github/workflows/trivy-dashboard.yml b/.github/workflows/trivy-dashboard.yml
deleted file mode 100644
index f4731b21..00000000
--- a/.github/workflows/trivy-dashboard.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: Trivy scan Wazuh dashboard
-
-on:
-  release:
-    types:
-    - published
-  pull_request:
-    branches:
-      - main
-  schedule:
-    - cron: '34 2 * * 1'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    permissions:
-      contents: read # for actions/checkout to fetch code
-      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
-
-    name: Build images and upload Trivy results
-    runs-on: "ubuntu-22.04"
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v6
-
-      - name: Installing dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y jq
-
-      - name: Checkout latest tag
-        run: |
-          latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name')
-          git fetch origin
-          git checkout $latest
-
-      - name: Build Wazuh images
-        run: build-docker-images/build-images.sh
-
-      - name: Create enviroment variables
-        run: |
-          cat .env > $GITHUB_ENV
-          echo "GITHUB_REF_NAME="${GITHUB_REF_NAME%/*} >> $GITHUB_ENV
-
-      - name: Run Trivy vulnerability scanner for Wazuh dashboard
-        uses: aquasecurity/trivy-action@2a2157eb22c08c9a1fac99263430307b8d1bc7a2
-        with:
-          image-ref: 'wazuh/wazuh-dashboard:${{env.WAZUH_IMAGE_VERSION}}'
-          format: 'template'
-          template: '@/contrib/sarif.tpl'
-          output: 'trivy-results-dashboard.sarif'
-          severity: 'LOW,MEDIUM,CRITICAL,HIGH'
-
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          sarif_file: 'trivy-results-dashboard.sarif'
-
-      - name: Slack notification
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_CHANNEL: cicd-monitoring
-          SLACK_COLOR: ${{ job.status }} # or a specific color like 'good' or '#ff00ff'
-          #SLACK_ICON: https://github.com/rtCamp.png?size=48
-          SLACK_MESSAGE: "Check the results: https://github.com/wazuh/wazuh-docker/security/code-scanning?query=is%3Aopen+branch%3A${{ env.GITHUB_REF_NAME }}"
-          SLACK_TITLE: Wazuh docker Trivy vulnerability scan finished.
-          SLACK_USERNAME: github_actions
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
\ No newline at end of file
diff --git a/.github/workflows/trivy-indexer.yml b/.github/workflows/trivy-indexer.yml
deleted file mode 100644
index bad0abef..00000000
--- a/.github/workflows/trivy-indexer.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: Trivy scan Wazuh indexer
-
-on:
-  release:
-    types:
-    - published
-  pull_request:
-    branches:
-      - main
-  schedule:
-    - cron: '34 2 * * 1'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    permissions:
-      contents: read # for actions/checkout to fetch code
-      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
-
-    name: Build images and upload Trivy results
-    runs-on: "ubuntu-22.04"
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v6
-
-      - name: Installing dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y jq
-
-      - name: Checkout latest tag
-        run: |
-          latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name')
-          git fetch origin
-          git checkout $latest
-
-      - name: Build Wazuh images
-        run: build-docker-images/build-images.sh
-
-      - name: Create enviroment variables
-        run: |
-          cat .env > $GITHUB_ENV
-          echo "GITHUB_REF_NAME="${GITHUB_REF_NAME%/*} >> $GITHUB_ENV
-
-      - name: Run Trivy vulnerability scanner for Wazuh indexer
-        uses: aquasecurity/trivy-action@2a2157eb22c08c9a1fac99263430307b8d1bc7a2
-        with:
-          image-ref: 'wazuh/wazuh-indexer:${{env.WAZUH_IMAGE_VERSION}}'
-          format: 'template'
-          template: '@/contrib/sarif.tpl'
-          output: 'trivy-results-indexer.sarif'
-          severity: 'LOW,MEDIUM,CRITICAL,HIGH'
-
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          sarif_file: 'trivy-results-indexer.sarif'
-
-      - name: Slack notification
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_CHANNEL: cicd-monitoring
-          SLACK_COLOR: ${{ job.status }} # or a specific color like 'good' or '#ff00ff'
-          #SLACK_ICON: https://github.com/rtCamp.png?size=48
-          SLACK_MESSAGE: "Check the results: https://github.com/wazuh/wazuh-docker/security/code-scanning?query=is%3Aopen+branch%3A${{ env.GITHUB_REF_NAME }}"
-          SLACK_TITLE: Wazuh docker Trivy vulnerability scan finished.
-          SLACK_USERNAME: github_actions
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
\ No newline at end of file
diff --git a/.github/workflows/trivy-manager.yml b/.github/workflows/trivy-manager.yml
deleted file mode 100644
index 609f36ac..00000000
--- a/.github/workflows/trivy-manager.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: Trivy scan Wazuh manager
-
-on:
-  release:
-    types:
-    - published
-  pull_request:
-    branches:
-      - main
-  schedule:
-    - cron: '34 2 * * 1'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    permissions:
-      contents: read # for actions/checkout to fetch code
-      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
-
-    name: Build images and upload Trivy results
-    runs-on: "ubuntu-22.04"
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v6
-
-      - name: Installing dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y jq
-
-      - name: Checkout latest tag
-        run: |
-          latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name')
-          git fetch origin
-          git checkout $latest
-
-      - name: Build Wazuh images
-        run: build-docker-images/build-images.sh
-
-      - name: Create enviroment variables
-        run: |
-          cat .env > $GITHUB_ENV
-          echo "GITHUB_REF_NAME="${GITHUB_REF_NAME%/*} >> $GITHUB_ENV
-
-      - name: Run Trivy vulnerability scanner for Wazuh manager
-        uses: aquasecurity/trivy-action@2a2157eb22c08c9a1fac99263430307b8d1bc7a2
-        with:
-          image-ref: 'wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}}'
-          format: 'template'
-          template: '@/contrib/sarif.tpl'
-          output: 'trivy-results-manager.sarif'
-          severity: 'LOW,MEDIUM,CRITICAL,HIGH'
-
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          sarif_file: 'trivy-results-manager.sarif'
-
-      - name: Slack notification
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_CHANNEL: cicd-monitoring
-          SLACK_COLOR: ${{ job.status }} # or a specific color like 'good' or '#ff00ff'
-          #SLACK_ICON: https://github.com/rtCamp.png?size=48
-          SLACK_MESSAGE: "Check the results: https://github.com/wazuh/wazuh-docker/security/code-scanning?query=is%3Aopen+branch%3A${{ env.GITHUB_REF_NAME }}"
-          SLACK_TITLE: Wazuh docker Trivy vulnerability scan finished.
-          SLACK_USERNAME: github_actions
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
\ No newline at end of file

From 68faac3ac19a9049d913e20720182fed99a7ccf6 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Wed, 10 Jun 2026 20:16:37 +0700
Subject: [PATCH 02/24] Move the Wazuh version of the workflow name from the
 end to the beginning

---
 .github/workflows/4_build_and_push_images.yml | 4 ++--
 .github/workflows/4_bumper_repository.yml     | 2 +-
 .github/workflows/4_pr_check.yml              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/4_build_and_push_images.yml b/.github/workflows/4_build_and_push_images.yml
index afef0da3..fab5601d 100644
--- a/.github/workflows/4_build_and_push_images.yml
+++ b/.github/workflows/4_build_and_push_images.yml
@@ -1,5 +1,5 @@
-run-name: Build and push images 4.x - ${{ inputs.dev && 'dev' || 'release' }} - ${{ inputs.id }}
-name: Build and push images 4.x
+run-name: (4.x) Build and push images - ${{ inputs.dev && 'dev' || 'release' }} - ${{ inputs.id }}
+name: (4.x) Build and push images
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml
index a215726c..ce540bf0 100644
--- a/.github/workflows/4_bumper_repository.yml
+++ b/.github/workflows/4_bumper_repository.yml
@@ -1,4 +1,4 @@
-name: Repository bumper
+name: (4.x) Repository bumper
 run-name: Bump ${{ github.ref_name }} (${{ inputs.id }})
 
 on:
diff --git a/.github/workflows/4_pr_check.yml b/.github/workflows/4_pr_check.yml
index a7b7f344..1db63adf 100644
--- a/.github/workflows/4_pr_check.yml
+++ b/.github/workflows/4_pr_check.yml
@@ -1,4 +1,4 @@
-name: Wazuh Docker pipeline 4.x
+name: (4.x) Wazuh Docker pipeline
 
 on:
   pull_request:

From 644cdba3a9a7db82a2caea43c2b1e16bc10dd2d9 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Wed, 10 Jun 2026 21:04:49 +0700
Subject: [PATCH 03/24] Add affected branchs

---
 .github/workflows/4_pr_check.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/4_pr_check.yml b/.github/workflows/4_pr_check.yml
index 1db63adf..dd12b8ca 100644
--- a/.github/workflows/4_pr_check.yml
+++ b/.github/workflows/4_pr_check.yml
@@ -2,6 +2,8 @@ name: (4.x) Wazuh Docker pipeline
 
 on:
   pull_request:
+    branches:
+      - 4.*
     paths:
       - 'build-docker-images/**'
       - 'multi-node/**'

From 271f6c2eb863c7b025e6cd44d8bd5ce4f5c1f53f Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Wed, 10 Jun 2026 21:14:32 +0700
Subject: [PATCH 04/24] Add types

---
 .github/workflows/4_pr_check.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/4_pr_check.yml b/.github/workflows/4_pr_check.yml
index dd12b8ca..53616334 100644
--- a/.github/workflows/4_pr_check.yml
+++ b/.github/workflows/4_pr_check.yml
@@ -2,6 +2,7 @@ name: (4.x) Wazuh Docker pipeline
 
 on:
   pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
     branches:
       - 4.*
     paths:

From 70f585de4d9c148fbce4f7d8de174d9053c09a93 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Wed, 10 Jun 2026 23:23:32 +0700
Subject: [PATCH 05/24] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c722be48..f997e189 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-- None
+- PR revamp modifications 4.x ([#2445](https://github.com/wazuh/wazuh-docker/pull/2445))
 
 ### Fixed
 

From c6c00fa9db74bfb9cd0bb8131ed60df4b2327bb9 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Tue, 16 Jun 2026 20:06:29 +0700
Subject: [PATCH 06/24] Change PR check name

---
 .github/workflows/4_pr_check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/4_pr_check.yml b/.github/workflows/4_pr_check.yml
index 53616334..66627d23 100644
--- a/.github/workflows/4_pr_check.yml
+++ b/.github/workflows/4_pr_check.yml
@@ -1,4 +1,4 @@
-name: (4.x) Wazuh Docker pipeline
+name: (4.x) Docker PR check
 
 on:
   pull_request:

From fd6e53b1e309c917082aaac5121cf6048f396fff Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Fri, 19 Jun 2026 18:16:54 +0700
Subject: [PATCH 07/24] Change runners on repository workflows

---
 .github/workflows/4_bumper_repository.yml          | 2 +-
 .github/workflows/Procedure_push_docker_images.yml | 6 +++---
 .github/workflows/push.yml                         | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml
index a215726c..228bad34 100644
--- a/.github/workflows/4_bumper_repository.yml
+++ b/.github/workflows/4_bumper_repository.yml
@@ -31,7 +31,7 @@ on:
 jobs:
   bump:
     name: Repository bumper
-    runs-on: ubuntu-22.04
+    runs-on: github-actions-codebuild-runner-devops-amd
     permissions:
       contents: write
       pull-requests: write
diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml
index e5b1409e..f8ece4d9 100644
--- a/.github/workflows/Procedure_push_docker_images.yml
+++ b/.github/workflows/Procedure_push_docker_images.yml
@@ -72,7 +72,7 @@ on:
 
 jobs:
   setup:
-    runs-on: ubuntu-22.04
+    runs-on: github-actions-codebuild-runner-devops-amd
 
     permissions:
       id-token: write
@@ -130,7 +130,7 @@ jobs:
         echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT
 
   build-and-push:
-    runs-on: ubuntu-22.04
+    runs-on: github-actions-codebuild-runner-devops-amd
 
     permissions:
       id-token: write
@@ -216,7 +216,7 @@ jobs:
 
 
   notify:
-    runs-on: ubuntu-22.04
+    runs-on: github-actions-codebuild-runner-devops-amd<
     needs: [setup, build-and-push]
     # Only run if NOT dev AND all products were selected
     if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 684a4ec5..4481ee7a 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -4,7 +4,7 @@ on: [pull_request]
 
 jobs:
   build-docker-images:
-    runs-on: ubuntu-22.04
+    runs-on: github-actions-codebuild-runner-devops-amd
     steps:
 
     - name: Check out code
@@ -65,7 +65,7 @@ jobs:
         GOSS_FILE: .github/.goss.yaml
 
   check-single-node:
-    runs-on: ubuntu-22.04
+    runs-on: github-actions-codebuild-runner-devops-amd
     needs: build-docker-images
     steps:
 
@@ -206,7 +206,7 @@ jobs:
       run: ./.github/single-node-log-check.sh
 
   check-multi-node:
-    runs-on: ubuntu-22.04
+    runs-on: github-actions-codebuild-runner-devops-amd
     needs: build-docker-images
     steps:
 

From 92866daabba952057b5805301edc9c0ea906ff02 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Fri, 19 Jun 2026 18:23:43 +0700
Subject: [PATCH 08/24] Change runners on repository workflows

---
 .github/workflows/4_bumper_repository.yml          | 2 +-
 .github/workflows/Procedure_push_docker_images.yml | 6 +++---
 .github/workflows/push.yml                         | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml
index 228bad34..a7407ac6 100644
--- a/.github/workflows/4_bumper_repository.yml
+++ b/.github/workflows/4_bumper_repository.yml
@@ -31,7 +31,7 @@ on:
 jobs:
   bump:
     name: Repository bumper
-    runs-on: github-actions-codebuild-runner-devops-amd
+    runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     permissions:
       contents: write
       pull-requests: write
diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml
index f8ece4d9..6b32d1ee 100644
--- a/.github/workflows/Procedure_push_docker_images.yml
+++ b/.github/workflows/Procedure_push_docker_images.yml
@@ -72,7 +72,7 @@ on:
 
 jobs:
   setup:
-    runs-on: github-actions-codebuild-runner-devops-amd
+    runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
 
     permissions:
       id-token: write
@@ -130,7 +130,7 @@ jobs:
         echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT
 
   build-and-push:
-    runs-on: github-actions-codebuild-runner-devops-amd
+    runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
 
     permissions:
       id-token: write
@@ -216,7 +216,7 @@ jobs:
 
 
   notify:
-    runs-on: github-actions-codebuild-runner-devops-amd<
+    runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: [setup, build-and-push]
     # Only run if NOT dev AND all products were selected
     if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 4481ee7a..b68e0e28 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -4,7 +4,7 @@ on: [pull_request]
 
 jobs:
   build-docker-images:
-    runs-on: github-actions-codebuild-runner-devops-amd
+    runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
 
     - name: Check out code
@@ -65,7 +65,7 @@ jobs:
         GOSS_FILE: .github/.goss.yaml
 
   check-single-node:
-    runs-on: github-actions-codebuild-runner-devops-amd
+    runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: build-docker-images
     steps:
 
@@ -206,7 +206,7 @@ jobs:
       run: ./.github/single-node-log-check.sh
 
   check-multi-node:
-    runs-on: github-actions-codebuild-runner-devops-amd
+    runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: build-docker-images
     steps:
 

From a185f0dc75ba12b59172fc7a341dec7dcbef22e8 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Fri, 19 Jun 2026 18:37:55 +0700
Subject: [PATCH 09/24] Change runners on repository workflows

---
 .github/workflows/4_bumper_repository.yml          | 2 +-
 .github/workflows/Procedure_push_docker_images.yml | 6 +++---
 .github/workflows/push.yml                         | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml
index a7407ac6..2a71992e 100644
--- a/.github/workflows/4_bumper_repository.yml
+++ b/.github/workflows/4_bumper_repository.yml
@@ -31,7 +31,7 @@ on:
 jobs:
   bump:
     name: Repository bumper
-    runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     permissions:
       contents: write
       pull-requests: write
diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml
index 6b32d1ee..a0562c6f 100644
--- a/.github/workflows/Procedure_push_docker_images.yml
+++ b/.github/workflows/Procedure_push_docker_images.yml
@@ -72,7 +72,7 @@ on:
 
 jobs:
   setup:
-    runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
 
     permissions:
       id-token: write
@@ -130,7 +130,7 @@ jobs:
         echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT
 
   build-and-push:
-    runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
 
     permissions:
       id-token: write
@@ -216,7 +216,7 @@ jobs:
 
 
   notify:
-    runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: [setup, build-and-push]
     # Only run if NOT dev AND all products were selected
     if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index b68e0e28..c1ede0e4 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -4,7 +4,7 @@ on: [pull_request]
 
 jobs:
   build-docker-images:
-    runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
 
     - name: Check out code
@@ -65,7 +65,7 @@ jobs:
         GOSS_FILE: .github/.goss.yaml
 
   check-single-node:
-    runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: build-docker-images
     steps:
 
@@ -206,7 +206,7 @@ jobs:
       run: ./.github/single-node-log-check.sh
 
   check-multi-node:
-    runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: build-docker-images
     steps:
 

From 27287b1e19606ae7b8c4e6c0b14ea07c29378064 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Fri, 19 Jun 2026 19:24:22 +0700
Subject: [PATCH 10/24] Adapt goss run with codebuild configuration

---
 .github/workflows/push.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index c1ede0e4..77ba45a2 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -59,10 +59,18 @@ jobs:
         version: v0.3.16
 
     - name: Execute Goss tests (wazuh-manager)
-      run: dgoss run wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}}
-      env:
-        GOSS_SLEEP: 30
-        GOSS_FILE: .github/.goss.yaml
+      run: |
+        # Start the Wazuh manager container
+        docker run -d --name wazuh_test wazuh/wazuh-manager:4.14.6
+        # Wait for the container to be fully up and running
+        sleep 30 
+        # Copy the Goss binary to the container
+        docker exec wazuh_test mkdir -p /goss
+        docker cp /usr/local/bin/goss wazuh_test:/goss/goss
+        # Copy your test file (.goss.yaml) to the container
+        docker cp .github/.goss.yaml wazuh_test:/goss/goss.yaml
+        # Execute the validation inside the container
+        docker exec -w /goss wazuh_test ./goss validate
 
   check-single-node:
     runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}

From b6fb0726938d068fec02e1e801c1edff065da306 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Fri, 19 Jun 2026 20:51:53 +0700
Subject: [PATCH 11/24] Delete goss test

---
 .github/workflows/push.yml | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 77ba45a2..62f71984 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -53,25 +53,6 @@ jobs:
         path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-agent.tar
         retention-days: 1
 
-    - name: Install Goss
-      uses: e1himself/goss-installation-action@v1.0.3
-      with:
-        version: v0.3.16
-
-    - name: Execute Goss tests (wazuh-manager)
-      run: |
-        # Start the Wazuh manager container
-        docker run -d --name wazuh_test wazuh/wazuh-manager:4.14.6
-        # Wait for the container to be fully up and running
-        sleep 30 
-        # Copy the Goss binary to the container
-        docker exec wazuh_test mkdir -p /goss
-        docker cp /usr/local/bin/goss wazuh_test:/goss/goss
-        # Copy your test file (.goss.yaml) to the container
-        docker cp .github/.goss.yaml wazuh_test:/goss/goss.yaml
-        # Execute the validation inside the container
-        docker exec -w /goss wazuh_test ./goss validate
-
   check-single-node:
     runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: build-docker-images

From 95d142a9b76a1f866841dac8a55adef70b294235 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Fri, 19 Jun 2026 22:23:40 +0700
Subject: [PATCH 12/24] Add docker login

---
 .github/workflows/push.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 62f71984..1164c947 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -10,6 +10,12 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v6
 
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v4
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
     - name: Build Wazuh images
       run: ./build-images.sh
       working-directory: ./build-docker-images

From 97f687c4090f321f6dd7b8684ca067debd693476 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Fri, 19 Jun 2026 22:37:58 +0700
Subject: [PATCH 13/24] Add docker login

---
 .github/workflows/push.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 1164c947..db2506c4 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -70,6 +70,12 @@ jobs:
     - name: Create enviroment variables
       run: cat .env > $GITHUB_ENV
 
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v4
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
     - name: Retrieve saved Wazuh indexer Docker image
       uses: actions/download-artifact@v8
       with:
@@ -211,6 +217,12 @@ jobs:
     - name: Create enviroment variables
       run: cat .env > $GITHUB_ENV
 
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v4
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
     - name: free disk space
       uses: ./.github/free-disk-space
 

From 67df871d7d78301a2d5dd96b8328468a2c8f5cf3 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Fri, 19 Jun 2026 23:39:54 +0700
Subject: [PATCH 14/24] Add docker login

---
 .../Procedure_push_docker_images.yml          |  4 --
 .github/workflows/push.yml                    | 59 +++++++++----------
 2 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml
index a0562c6f..2e28062c 100644
--- a/.github/workflows/Procedure_push_docker_images.yml
+++ b/.github/workflows/Procedure_push_docker_images.yml
@@ -155,9 +155,6 @@ jobs:
       with:
         ref: ${{ inputs.docker_reference }}
 
-    - name: free disk space
-      uses: ./.github/free-disk-space
-
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v4
 
@@ -176,7 +173,6 @@ jobs:
       uses: aws-actions/amazon-ecr-login@v2
 
     - name: Log in to Docker Hub
-      if: ${{ inputs.dev == false }}
       uses: docker/login-action@v4
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index db2506c4..156323c6 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -139,17 +139,6 @@ jobs:
         exit 1
        fi
 
-    - name: Check documents into wazuh-alerts index
-      run: |
-       sleep 120
-       docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`"
-       if [[ $docs -gt 0 ]]; then
-        echo "wazuh-alerts index documents: ${docs}"
-       else
-        echo "wazuh-alerts index documents: ${docs}"
-        exit 1
-       fi
-
     - name: Check Wazuh templates
       run: |
        qty_templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep -P "wazuh|wazuh-agent|wazuh-statistics" | wc -l`"
@@ -203,6 +192,17 @@ jobs:
       env:
         TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")
 
+    - name: Check documents into wazuh-alerts index
+      run: |
+       sleep 120
+       docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`"
+       if [[ $docs -gt 0 ]]; then
+        echo "wazuh-alerts index documents: ${docs}"
+       else
+        echo "wazuh-alerts index documents: ${docs}"
+        exit 1
+       fi
+
     - name: Check errors in ossec.log for Wazuh manager
       run: ./.github/single-node-log-check.sh
 
@@ -223,9 +223,6 @@ jobs:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
-    - name: free disk space
-      uses: ./.github/free-disk-space
-
     - name: Retrieve saved Wazuh dashboard Docker image
       uses: actions/download-artifact@v8
       with:
@@ -295,23 +292,6 @@ jobs:
         exit 1
        fi
 
-    - name: Check documents into wazuh-alerts index
-      run: |
-       until [[ $(``curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"``)  -gt 0 ]]
-       do
-         echo 'Waiting for Wazuh indexer events'
-         free -m
-         df -h
-         sleep 10
-       done
-       docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`"
-       if [[ $docs -gt 0 ]]; then
-        echo "wazuh-alerts index documents: ${docs}"
-       else
-        echo "wazuh-alerts index documents: ${docs}"
-        exit 1
-       fi
-
     - name: Check Wazuh templates
       run: |
        qty_templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep "wazuh" | wc -l`"
@@ -372,5 +352,22 @@ jobs:
       env:
         TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")
 
+    - name: Check documents into wazuh-alerts index
+      run: |
+       until [[ $(``curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"``)  -gt 0 ]]
+       do
+         echo 'Waiting for Wazuh indexer events'
+         free -m
+         df -h
+         sleep 10
+       done
+       docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`"
+       if [[ $docs -gt 0 ]]; then
+        echo "wazuh-alerts index documents: ${docs}"
+       else
+        echo "wazuh-alerts index documents: ${docs}"
+        exit 1
+       fi
+
     - name: Check errors in ossec.log for Wazuh manager
       run: ./.github/multi-node-log-check.sh

From 4ad604f33cf2f7d239dd81ac1823143c0b1c1eab Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Sat, 20 Jun 2026 00:32:06 +0700
Subject: [PATCH 15/24] Change runners on repository workflows

---
 .github/workflows/5_build_and_push_images.yml |  9 +++----
 .github/workflows/5_bumper_repository.yml     |  2 +-
 .../workflows/5_check_integration_tools.yml   |  8 +++---
 .github/workflows/5_pr_check.yml              | 26 ++++++++++++-------
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/5_build_and_push_images.yml b/.github/workflows/5_build_and_push_images.yml
index 9aaf8286..a1c2138b 100644
--- a/.github/workflows/5_build_and_push_images.yml
+++ b/.github/workflows/5_build_and_push_images.yml
@@ -85,7 +85,7 @@ permissions:
 jobs:
   setup:
     runs-on:
-      group: wz-linux-amd64
+      group: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
 
     outputs:
       WAZUH_COMPONENTS: ${{ steps.compute-outputs.outputs.WAZUH_COMPONENTS }}
@@ -161,7 +161,7 @@ jobs:
   package-urls:
     name: generate package urls
     runs-on:
-      group: wz-linux-amd64
+      group: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: setup
 
     env:
@@ -293,7 +293,7 @@ jobs:
 
   build-and-push:
     runs-on:
-      group: wz-linux-amd64
+      group: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
 
     needs:
       - setup
@@ -333,7 +333,6 @@ jobs:
       uses: aws-actions/amazon-ecr-login@v2
 
     - name: Log in to Docker Hub
-      if: ${{ inputs.dev == false }}
       uses: docker/login-action@v4
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -421,7 +420,7 @@ jobs:
 
 
   notify:
-    runs-on: ubuntu-22.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: [setup, build-and-push]
     # Only run if NOT dev AND all products were selected
     if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }}
diff --git a/.github/workflows/5_bumper_repository.yml b/.github/workflows/5_bumper_repository.yml
index b146f00e..ae1b3e63 100644
--- a/.github/workflows/5_bumper_repository.yml
+++ b/.github/workflows/5_bumper_repository.yml
@@ -40,7 +40,7 @@ on:
 jobs:
   bump:
     name: Repository bumper 5.x
-    runs-on: ubuntu-24.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     permissions:
       contents: write
       pull-requests: write
diff --git a/.github/workflows/5_check_integration_tools.yml b/.github/workflows/5_check_integration_tools.yml
index 1cdc3793..c29176d7 100644
--- a/.github/workflows/5_check_integration_tools.yml
+++ b/.github/workflows/5_check_integration_tools.yml
@@ -72,7 +72,7 @@ jobs:
       (contains(github.event.comment.body, '/test-docker-single') ||
        contains(github.event.comment.body, '/test-docker-multi') ||
        contains(github.event.comment.body, '/test-docker'))
-    runs-on: ubuntu-latest
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     outputs:
       pr_number: ${{ steps.pr_data.outputs.pr_number }}
       pr_head_ref: ${{ steps.pr_data.outputs.pr_head_ref }}
@@ -156,7 +156,7 @@ jobs:
     if: |
       always() &&
       (needs.get_pr_info.result == 'success' || github.event_name == 'workflow_dispatch')
-    runs-on: ubuntu-latest
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     outputs:
       pr_head_ref: ${{ steps.ctx.outputs.pr_head_ref }}
       deployment_matrix: ${{ steps.ctx.outputs.deployment_matrix }}
@@ -322,7 +322,7 @@ jobs:
       always() &&
       needs.prepare.result == 'success' &&
       (needs.build_images.result == 'success' || needs.build_images.result == 'skipped')
-    runs-on: ubuntu-latest
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     strategy:
       fail-fast: false
       matrix:
@@ -848,7 +848,7 @@ jobs:
   update_check:
     needs: [get_pr_info, prepare, build_images, docker_test]
     if: always() && github.event_name == 'issue_comment' && needs.get_pr_info.result == 'success'
-    runs-on: ubuntu-latest
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
       - name: Update check run
         uses: actions/github-script@v7
diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml
index 0b8f0ad8..c3c1eaea 100644
--- a/.github/workflows/5_pr_check.yml
+++ b/.github/workflows/5_pr_check.yml
@@ -25,7 +25,7 @@ jobs:
 
   prepare-variables:
     if: ${{ !github.event.pull_request.draft }}
-    runs-on: ubuntu-latest
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     outputs:
       WAZUH_VERSION: ${{ steps.dotenv.outputs.WAZUH_VERSION }}
       WAZUH_IMAGE_VERSION: ${{ steps.dotenv.outputs.WAZUH_IMAGE_VERSION }}
@@ -63,7 +63,7 @@ jobs:
 
   Execute-Goss-tests:
     needs: [prepare-variables, build-images]
-    runs-on: ubuntu-22.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     env:
       WAZUH_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
       WAZUH_REGISTRY: ${{ needs.prepare-variables.outputs.WAZUH_REGISTRY }}
@@ -97,7 +97,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, ubuntu-22.04-arm]
+        os: ["codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}", "codebuild-github-actions-codebuild-runner-devops-arm-${{ github.run_id }}-${{ github.run_attempt }}"]
       fail-fast: false
     needs: [prepare-variables, Execute-Goss-tests]
     env:
@@ -114,9 +114,6 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v4
 
-    - name: free disk space
-      uses: ./.github/free-disk-space
-
     - name: Configure aws credentials
       uses: aws-actions/configure-aws-credentials@v4
       with:
@@ -132,6 +129,12 @@ jobs:
         name: presigned-artifact-urls-${{ github.run_id }}
         path: ./single-node/
 
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v4
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
     - name: Add environment variables into GITHUB_ENV
       run: |
         # Export variables to the environment
@@ -372,7 +375,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, ubuntu-22.04-arm]
+        os: ["codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}", "codebuild-github-actions-codebuild-runner-devops-arm-${{ github.run_id }}-${{ github.run_attempt }}"]
       fail-fast: false
     needs: [prepare-variables, Execute-Goss-tests]
     env:
@@ -389,9 +392,6 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v4
 
-    - name: free disk space
-      uses: ./.github/free-disk-space
-
     - name: Configure aws credentials
       uses: aws-actions/configure-aws-credentials@v4
       with:
@@ -407,6 +407,12 @@ jobs:
         name: presigned-artifact-urls-${{ github.run_id }}
         path: ./multi-node/
 
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v4
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
     - name: Add environment variables into GITHUB_ENV
       run: |
         # Export variables to the environment

From fde156181a5a13df33d7ca967cc5b01fed54a045 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Sat, 20 Jun 2026 00:40:35 +0700
Subject: [PATCH 16/24] Change runners name

---
 .github/workflows/5_build_and_push_images.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/5_build_and_push_images.yml b/.github/workflows/5_build_and_push_images.yml
index a1c2138b..5ad03f88 100644
--- a/.github/workflows/5_build_and_push_images.yml
+++ b/.github/workflows/5_build_and_push_images.yml
@@ -84,8 +84,7 @@ permissions:
 
 jobs:
   setup:
-    runs-on:
-      group: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
 
     outputs:
       WAZUH_COMPONENTS: ${{ steps.compute-outputs.outputs.WAZUH_COMPONENTS }}
@@ -160,8 +159,7 @@ jobs:
 
   package-urls:
     name: generate package urls
-    runs-on:
-      group: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: setup
 
     env:
@@ -292,8 +290,7 @@ jobs:
           path: ${{ env.LOCAL_ARTIFACT_URLS_FILEPATH }}
 
   build-and-push:
-    runs-on:
-      group: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
 
     needs:
       - setup

From 33d0fc3462d3fc5e1a56b73cf12598d960b0a3ec Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Sat, 20 Jun 2026 00:47:42 +0700
Subject: [PATCH 17/24] Change Docker login step

---
 .github/workflows/5_build_and_push_images.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/5_build_and_push_images.yml b/.github/workflows/5_build_and_push_images.yml
index 5ad03f88..8cec8d89 100644
--- a/.github/workflows/5_build_and_push_images.yml
+++ b/.github/workflows/5_build_and_push_images.yml
@@ -312,6 +312,12 @@ jobs:
         ref: ${{ inputs.docker_reference }}
         persist-credentials: false
 
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v4
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v4
 
@@ -329,12 +335,6 @@ jobs:
       if: ${{ inputs.dev == true }}
       uses: aws-actions/amazon-ecr-login@v2
 
-    - name: Log in to Docker Hub
-      uses: docker/login-action@v4
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
     - name: Download artifact_urls.yaml (dev)
       if: ${{ inputs.dev == true }}
       uses: actions/download-artifact@v4

From 749763c54785cd2689d7ec334bdb687acfc8d28f Mon Sep 17 00:00:00 2001
From: wazuhci <22834044+wazuhci@users.noreply.github.com>
Date: Mon, 22 Jun 2026 12:19:27 +0000
Subject: [PATCH 18/24] feat: bump 5.0.0

---
 .github/workflows/5_build_and_push_images.yml   | 8 ++++----
 .github/workflows/5_check_integration_tools.yml | 2 +-
 .github/workflows/5_pr_check.yml                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/5_build_and_push_images.yml b/.github/workflows/5_build_and_push_images.yml
index 9aaf8286..9a0676ab 100644
--- a/.github/workflows/5_build_and_push_images.yml
+++ b/.github/workflows/5_build_and_push_images.yml
@@ -6,7 +6,7 @@ on:
     inputs:
       image_tag:
         description: 'Docker image tag'
-        default: '5.0.0'
+        default: 'v5.0.0-beta3'
         required: true
       docker_reference:
         description: 'wazuh-docker reference'
@@ -14,7 +14,7 @@ on:
       wazuh_automation_reference:
         description: 'Branch or tag of the wazuh-automation repository'
         required: false
-        default: 'main'
+        default: 'v5.0.0-beta3'
       products:
         description: 'Comma-separated list of the image names to build and push'
         default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent'
@@ -42,7 +42,7 @@ on:
     inputs:
       image_tag:
         description: 'Docker image tag'
-        default: '5.0.0'
+        default: 'v5.0.0-beta3'
         required: true
         type: string
       docker_reference:
@@ -52,7 +52,7 @@ on:
       wazuh_automation_reference:
         description: 'Branch or tag of the wazuh-automation repository'
         required: false
-        default: 'main'
+        default: 'v5.0.0-beta3'
         type: string
       products:
         description: 'Comma-separated list of the image names to build and push'
diff --git a/.github/workflows/5_check_integration_tools.yml b/.github/workflows/5_check_integration_tools.yml
index 1cdc3793..12321c70 100644
--- a/.github/workflows/5_check_integration_tools.yml
+++ b/.github/workflows/5_check_integration_tools.yml
@@ -16,7 +16,7 @@ on:
       automation_reference:
         description: 'Branch of wazuh-automation to use'
         required: false
-        default: 'main'
+        default: 'v5.0.0-beta3'
         type: string
       deployment_type:
         description: 'Deployment type to test'
diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml
index 0b8f0ad8..5e2dcce0 100644
--- a/.github/workflows/5_pr_check.yml
+++ b/.github/workflows/5_pr_check.yml
@@ -55,7 +55,7 @@ jobs:
     with:
       image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
       docker_reference: ${{ github.head_ref || inputs.docker_reference }}
-      wazuh_automation_reference: 'main'
+      wazuh_automation_reference: 'v5.0.0-beta3'
       commit_list: '["latest", "latest", "latest", "latest"]'
       assistant_revision: 'latest'
       id: ${{ github.run_id }}

From 6371c2497fd29166678452fc5f6c11647c4dd31c Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Mon, 22 Jun 2026 19:21:20 +0700
Subject: [PATCH 19/24] Update changelog

---
 .github/workflows/5_check_integration_tools.yml | 4 ++--
 CHANGELOG.md                                    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/5_check_integration_tools.yml b/.github/workflows/5_check_integration_tools.yml
index c29176d7..2ff62abc 100644
--- a/.github/workflows/5_check_integration_tools.yml
+++ b/.github/workflows/5_check_integration_tools.yml
@@ -333,7 +333,7 @@ jobs:
       # Setup
       # -----------------------------------------------------------------------
       - name: Checkout wazuh-automation
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: wazuh/wazuh-automation
           ref: ${{ env.AUTOMATION_REFERENCE }}
@@ -341,7 +341,7 @@ jobs:
           path: wazuh-automation
 
       - name: Checkout wazuh-docker PR branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: ${{ needs.prepare.outputs.pr_head_ref }}
           path: wazuh-docker
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4108269d..2a5996d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+- Change runners on repository workflows 5.x ([#2471](https://github.com/wazuh/wazuh-docker/pull/2471))
 - PR revamp modifications 5.x ([#2446](https://github.com/wazuh/wazuh-docker/pull/2446))
 - Forbid pr_check workflow execution in draft PRs ([#2399](https://github.com/wazuh/wazuh-docker/pull/2399))
 - Unification of user UID and GID ([#2393](https://github.com/wazuh/wazuh-docker/pull/2393))

From 0c04e23e41d3f56db47db30a4f0e97ddd853cf7c Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Mon, 22 Jun 2026 19:40:51 +0700
Subject: [PATCH 20/24] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd192988..2768495e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-- None
+- Change runners on repository workflows ([#2470](https://github.com/wazuh/wazuh-docker/pull/2470))
 
 ### Fixed
 

From 712489f1312276cdc0f24592ffdccbf5e95d7eed Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Mon, 22 Jun 2026 20:32:12 +0700
Subject: [PATCH 21/24] change runners for 4.x workflows

---
 .github/workflows/4_build_and_push_images.yml | 6 +++---
 .github/workflows/4_bumper_repository.yml     | 2 +-
 .github/workflows/4_pr_check.yml              | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/4_build_and_push_images.yml b/.github/workflows/4_build_and_push_images.yml
index fab5601d..4eaa38e7 100644
--- a/.github/workflows/4_build_and_push_images.yml
+++ b/.github/workflows/4_build_and_push_images.yml
@@ -72,7 +72,7 @@ on:
 
 jobs:
   setup:
-    runs-on: ubuntu-22.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
 
     permissions:
       id-token: write
@@ -130,7 +130,7 @@ jobs:
         echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT
 
   build-and-push:
-    runs-on: ubuntu-22.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
 
     permissions:
       id-token: write
@@ -216,7 +216,7 @@ jobs:
 
 
   notify:
-    runs-on: ubuntu-22.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: [setup, build-and-push]
     # Only run if NOT dev AND all products were selected
     if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }}
diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml
index f4d2f6b4..1fd26c7d 100644
--- a/.github/workflows/4_bumper_repository.yml
+++ b/.github/workflows/4_bumper_repository.yml
@@ -31,7 +31,7 @@ on:
 jobs:
   bump:
     name: Repository bumper 4.x
-    runs-on: ubuntu-24.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     permissions:
       contents: write
       pull-requests: write
diff --git a/.github/workflows/4_pr_check.yml b/.github/workflows/4_pr_check.yml
index 66627d23..941de780 100644
--- a/.github/workflows/4_pr_check.yml
+++ b/.github/workflows/4_pr_check.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   build-docker-images:
-    runs-on: ubuntu-22.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
 
     - name: Check out code
@@ -75,7 +75,7 @@ jobs:
         GOSS_FILE: .github/.goss.yaml
 
   check-single-node:
-    runs-on: ubuntu-22.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: build-docker-images
     steps:
 
@@ -216,7 +216,7 @@ jobs:
       run: ./.github/single-node-log-check.sh
 
   check-multi-node:
-    runs-on: ubuntu-22.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: build-docker-images
     steps:
 

From 2fceb8c11052bc6f623cd2b077c492534f00601c Mon Sep 17 00:00:00 2001
From: Carlos Bordon <carlos.e.bordon@gmail.com>
Date: Mon, 22 Jun 2026 11:48:22 -0300
Subject: [PATCH 22/24] Fixed 5.0.0 branch references after bump

---
 .github/workflows/5_build_and_push_images.yml   | 8 ++++----
 .github/workflows/5_check_integration_tools.yml | 2 +-
 .github/workflows/5_pr_check.yml                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/5_build_and_push_images.yml b/.github/workflows/5_build_and_push_images.yml
index 9a0676ab..f87f211c 100644
--- a/.github/workflows/5_build_and_push_images.yml
+++ b/.github/workflows/5_build_and_push_images.yml
@@ -6,7 +6,7 @@ on:
     inputs:
       image_tag:
         description: 'Docker image tag'
-        default: 'v5.0.0-beta3'
+        default: '5.0.0'
         required: true
       docker_reference:
         description: 'wazuh-docker reference'
@@ -14,7 +14,7 @@ on:
       wazuh_automation_reference:
         description: 'Branch or tag of the wazuh-automation repository'
         required: false
-        default: 'v5.0.0-beta3'
+        default: '5.0.0'
       products:
         description: 'Comma-separated list of the image names to build and push'
         default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent'
@@ -42,7 +42,7 @@ on:
     inputs:
       image_tag:
         description: 'Docker image tag'
-        default: 'v5.0.0-beta3'
+        default: '5.0.0'
         required: true
         type: string
       docker_reference:
@@ -52,7 +52,7 @@ on:
       wazuh_automation_reference:
         description: 'Branch or tag of the wazuh-automation repository'
         required: false
-        default: 'v5.0.0-beta3'
+        default: '5.0.0'
         type: string
       products:
         description: 'Comma-separated list of the image names to build and push'
diff --git a/.github/workflows/5_check_integration_tools.yml b/.github/workflows/5_check_integration_tools.yml
index 12321c70..739435b6 100644
--- a/.github/workflows/5_check_integration_tools.yml
+++ b/.github/workflows/5_check_integration_tools.yml
@@ -16,7 +16,7 @@ on:
       automation_reference:
         description: 'Branch of wazuh-automation to use'
         required: false
-        default: 'v5.0.0-beta3'
+        default: '5.0.0'
         type: string
       deployment_type:
         description: 'Deployment type to test'
diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml
index 5e2dcce0..e1bb0358 100644
--- a/.github/workflows/5_pr_check.yml
+++ b/.github/workflows/5_pr_check.yml
@@ -55,7 +55,7 @@ jobs:
     with:
       image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
       docker_reference: ${{ github.head_ref || inputs.docker_reference }}
-      wazuh_automation_reference: 'v5.0.0-beta3'
+      wazuh_automation_reference: '5.0.0'
       commit_list: '["latest", "latest", "latest", "latest"]'
       assistant_revision: 'latest'
       id: ${{ github.run_id }}

From 7feacc4403bf2743508982878dc556590a92fdb7 Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Tue, 23 Jun 2026 21:12:27 +0700
Subject: [PATCH 23/24] Update LTS changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f57df301..0e0aa627 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -292,7 +292,8 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-- None
+- Change runner name for Codebuild ([#2474](https://github.com/wazuh/wazuh-docker/pull/2474))
+- PR revamp modifications LTS ([#2449](https://github.com/wazuh/wazuh-docker/pull/2449))
 
 ### Fixed
 

From 9c5fd31608da7076ea0e7d7a0d65fae07e99e47d Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Wed, 24 Jun 2026 20:53:22 +0700
Subject: [PATCH 24/24] Bump newer 5.0.0 commits to main branch

---
 .github/workflows/5_build_and_push_images.yml   | 4 ++--
 .github/workflows/5_check_integration_tools.yml | 2 +-
 .github/workflows/5_pr_check.yml                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/5_build_and_push_images.yml b/.github/workflows/5_build_and_push_images.yml
index f57eda57..e6f2ce88 100644
--- a/.github/workflows/5_build_and_push_images.yml
+++ b/.github/workflows/5_build_and_push_images.yml
@@ -14,7 +14,7 @@ on:
       wazuh_automation_reference:
         description: 'Branch or tag of the wazuh-automation repository'
         required: false
-        default: '5.0.0'
+        default: 'main'
       products:
         description: 'Comma-separated list of the image names to build and push'
         default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent'
@@ -52,7 +52,7 @@ on:
       wazuh_automation_reference:
         description: 'Branch or tag of the wazuh-automation repository'
         required: false
-        default: '5.0.0'
+        default: 'main'
         type: string
       products:
         description: 'Comma-separated list of the image names to build and push'
diff --git a/.github/workflows/5_check_integration_tools.yml b/.github/workflows/5_check_integration_tools.yml
index 76146995..9fb4e6cd 100644
--- a/.github/workflows/5_check_integration_tools.yml
+++ b/.github/workflows/5_check_integration_tools.yml
@@ -16,7 +16,7 @@ on:
       automation_reference:
         description: 'Branch of wazuh-automation to use'
         required: false
-        default: '5.0.0'
+        default: 'main'
         type: string
       deployment_type:
         description: 'Deployment type to test'
diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml
index 6bc408d9..c3c1eaea 100644
--- a/.github/workflows/5_pr_check.yml
+++ b/.github/workflows/5_pr_check.yml
@@ -55,7 +55,7 @@ jobs:
     with:
       image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
       docker_reference: ${{ github.head_ref || inputs.docker_reference }}
-      wazuh_automation_reference: '5.0.0'
+      wazuh_automation_reference: 'main'
       commit_list: '["latest", "latest", "latest", "latest"]'
       assistant_revision: 'latest'
       id: ${{ github.run_id }}