diff --git a/.github/workflows/build-containers-enterprise.yml b/.github/workflows/build-containers-enterprise.yml
index 1b675ba5..c8fa8ba2 100644
--- a/.github/workflows/build-containers-enterprise.yml
+++ b/.github/workflows/build-containers-enterprise.yml
@@ -25,7 +25,7 @@ jobs:
         include:
           - runnertags: ubuntu-latest
             arch: amd64
-          - runnertags: ubuntu-latest
+          - runnertags: ubuntu-24.04-arm
             arch: arm64
 
     runs-on: ${{ matrix.runnertags }}
@@ -37,10 +37,6 @@ jobs:
           submodules: 'true'
           token: ${{ secrets.PAT_TOKEN }}
 
-      - name: Set up QEMU (For ARM64 Builds)
-        if: matrix.arch == 'arm64'
-        uses: docker/setup-qemu-action@v3
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
index cf2cf0ca..e0fc50f6 100644
--- a/.github/workflows/build-containers.yml
+++ b/.github/workflows/build-containers.yml
@@ -25,9 +25,8 @@ jobs:
         include:
           - runnertags: ubuntu-latest
             arch: amd64
-          - runnertags: ubuntu-latest
+          - runnertags: ubuntu-24.04-arm
             arch: arm64
-
     runs-on: ${{ matrix.runnertags }}
     steps:
       - name: Checkout
@@ -35,10 +34,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up QEMU (For ARM64 Builds)
-        if: matrix.arch == 'arm64'
-        uses: docker/setup-qemu-action@v3
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3