diff --git a/.github/workflows/4_build_and_push_images.yml b/.github/workflows/4_build_and_push_images.yml
index 0b73740c..ecb3a092 100644
--- a/.github/workflows/4_build_and_push_images.yml
+++ b/.github/workflows/4_build_and_push_images.yml
@@ -82,7 +82,7 @@ on:
 
 jobs:
   build-and-push:
-    runs-on: ubuntu-latest
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
 
     steps:
     - name: Print inputs
diff --git a/.github/workflows/4_pr_check.yml b/.github/workflows/4_pr_check.yml
index d64694c9..c5e712bc 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-latest
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
 
     - name: Check out code
@@ -71,7 +71,7 @@ jobs:
         GOSS_FILE: .github/.goss.yaml
 
   check-single-node:
-    runs-on: ubuntu-latest
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: build-docker-images
     steps:
 
@@ -199,7 +199,7 @@ jobs:
       run: ./.github/single-node-log-check.sh
 
   check-multi-node:
-    runs-on: ubuntu-latest
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: build-docker-images
     steps:
 
@@ -214,14 +214,6 @@ jobs:
     - name: Create enviroment variables
       run: cat .env > $GITHUB_ENV
 
-    - name: free disk space
-      run: |
-        sudo swapoff -a
-        sudo rm -f /swapfile
-        sudo apt clean
-        docker rmi $(docker image ls -aq)
-        df -h
-
     - name: Retrieve saved Wazuh dashboard Docker image
       uses: actions/download-artifact@v8
       with:
@@ -257,6 +249,7 @@ jobs:
          echo 'Waiting for Wazuh indexer start'
          free -m
          df -h
+         docker ps
          sleep 120
        done
        status_green="`curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s | grep green | wc -l`"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8e7cd7c..c506d17a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+- 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