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 1/5] 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 2/5] 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 3/5] 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 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 4/5] 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 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 5/5] 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: