diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index 0e5778eefe..4e3fab3f60 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -20,7 +20,7 @@ on:
 
 jobs:
   manifest:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04-arm
     outputs:
       build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
     container:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d28e1f2bec..7e0ff6ed58 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
   manifest:
     outputs:
       build_matrix: ${{ steps.parsing.outputs.build_matrix }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04-arm
     container:
       image: ghcr.io/terrapkg/builder:frawhide
       options: --cap-add=SYS_ADMIN --privileged
diff --git a/.github/workflows/update-branch.yml b/.github/workflows/update-branch.yml
index c8c6e8fd8b..2a43172b4e 100644
--- a/.github/workflows/update-branch.yml
+++ b/.github/workflows/update-branch.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   autoupdate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04-arm
     strategy:
       matrix:
         branch:
diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml
index d207012788..3c026bb3b8 100644
--- a/.github/workflows/update-comps.yml
+++ b/.github/workflows/update-comps.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   update-comps:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04-arm
     container:
       image: ghcr.io/terrapkg/builder:frawhide
     steps:
diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml
index 4276a9efde..a9d3bc9e15 100644
--- a/.github/workflows/update-nightly.yml
+++ b/.github/workflows/update-nightly.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   autoupdate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04-arm
     container:
       image: ghcr.io/terrapkg/builder:frawhide
       options: --cap-add=SYS_ADMIN --privileged
diff --git a/.github/workflows/update-weekly.yml b/.github/workflows/update-weekly.yml
index 8ed3b81fea..379a6e516e 100644
--- a/.github/workflows/update-weekly.yml
+++ b/.github/workflows/update-weekly.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   autoupdate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04-arm
     container:
       image: ghcr.io/terrapkg/builder:frawhide
       options: --cap-add=SYS_ADMIN --privileged
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 4ca198325d..1e9a115dba 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   autoupdate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04-arm
     container:
       image: ghcr.io/terrapkg/builder:frawhide
       options: --cap-add=SYS_ADMIN --privileged