diff --git a/.github/workflows/docker-heartbeats-processor.yaml b/.github/workflows/docker-heartbeats-processor.yaml
index 94e22d83bd..ed4c2c48c0 100644
--- a/.github/workflows/docker-heartbeats-processor.yaml
+++ b/.github/workflows/docker-heartbeats-processor.yaml
@@ -18,7 +18,7 @@ jobs:
           - platform: linux/amd64
             runs-on: ubuntu-latest
           - platform: linux/arm64
-            runs-on: ubuntu-arm64
+            runs-on: ubuntu-24.04-arm
     runs-on: ${{ matrix.arch.runs-on }}
     steps:
       - name: Prepare
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index dc6ba1c467..87ce14b2ea 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -23,7 +23,7 @@ jobs:
           - platform: linux/amd64
             runs-on: ubuntu-latest
           - platform: linux/arm64
-            runs-on: ubuntu-arm64
+            runs-on: ubuntu-24.04-arm
     runs-on: ${{ matrix.arch.runs-on }}
     steps:
       - name: Prepare
@@ -33,7 +33,7 @@ jobs:
 
       - name: Git checkout
         uses: actions/checkout@v3
-      
+
       # This is needed so that we can get the current version with vergen
       - name: Fetch tag for current commit
         run: |
@@ -125,7 +125,7 @@ jobs:
           - platform: linux/amd64
             runs-on: ubuntu-latest
           - platform: linux/arm64
-            runs-on: ubuntu-arm64
+            runs-on: ubuntu-24.04-arm
         configuration:
           - build_configuration: production
     runs-on: ${{ matrix.arch.runs-on }}