diff --git a/.github/workflows/_docker.yml b/.github/workflows/_docker.yml
index edecf7f857..c1cb7c3c34 100644
--- a/.github/workflows/_docker.yml
+++ b/.github/workflows/_docker.yml
@@ -47,14 +47,17 @@ jobs:
     -
       name: Set up Docker
       uses: crazy-max/ghaction-setup-docker@v3
+      if: inputs.runner != 'ubuntu-latest-arm64'
       with:
         daemon-config: '{ "features": { "containerd-snapshotter": true } }'        
     -
       name: Setup QEMU
       uses: docker/setup-qemu-action@v3
+      if: inputs.runner != 'ubuntu-latest-arm64'
     -
       name: Setup Docker Buildx
       uses: docker/setup-buildx-action@v3
+      if: inputs.runner != 'ubuntu-latest-arm64'
       with:
         version: 'latest'
         driver-opts: 'image=moby/buildkit:buildx-stable-1'
diff --git a/.github/workflows/_docker_manifests.yml b/.github/workflows/_docker_manifests.yml
index 0049c2438f..2c8ad8601e 100644
--- a/.github/workflows/_docker_manifests.yml
+++ b/.github/workflows/_docker_manifests.yml
@@ -34,14 +34,17 @@ jobs:
     -
       name: Set up Docker
       uses: crazy-max/ghaction-setup-docker@v3
+      if: inputs.runner != 'ubuntu-latest-arm64'
       with:
         daemon-config: '{ "features": { "containerd-snapshotter": true } }'
     -
       name: Setup QEMU
       uses: docker/setup-qemu-action@v3
+      if: inputs.runner != 'ubuntu-latest-arm64'
     -
       name: Setup Docker Buildx
       uses: docker/setup-buildx-action@v3
+      if: inputs.runner != 'ubuntu-latest-arm64'
       with:
         version: 'latest'
         driver-opts: 'image=moby/buildkit:buildx-stable-1'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a85688e8db..e72c287daf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,7 +68,7 @@ jobs:
           - arch: amd64
             runner: ubuntu-latest
           - arch: arm64
-            runner: ubuntu-latest
+            runner: ubuntu-latest-arm64
     uses: ./.github/workflows/_artifacts_linux.yml
     with:
       runner: ${{ matrix.runner }}
@@ -84,7 +84,7 @@ jobs:
           - arch: amd64
             runner: ubuntu-latest
           - arch: arm64
-            runner: ubuntu-latest
+            runner: ubuntu-latest-arm64
 
     uses: ./.github/workflows/_docker.yml
     with: