diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f42a817..c0cb1a6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -29,7 +29,7 @@ jobs:
         include:
           - PLATFORM: amd64
             RUNNER: self-hosted-amd64-1cpu
-          - PLATFORM: aarch64
+          - PLATFORM: arm64
             RUNNER: self-hosted-arm64-1cpu
     outputs:
       helm_args: ${{ steps.compute_helm_args.outputs.helm_args }}
@@ -47,8 +47,8 @@ jobs:
       - name: Save artifact
         uses: actions/upload-artifact@v3
         with:
-          name: docker-image-${{ matrix.PLATFORM }}.tar
-          path: artifacts/docker-image-${{ matrix.PLATFORM }}.tar
+          name: sidecar-${{ matrix.PLATFORM }}.tar
+          path: artifacts/sidecar-${{ matrix.PLATFORM }}.tar
           retention-days: 1
 
       - name: Compute Helm arguments
@@ -124,10 +124,10 @@ jobs:
       - name: Load cache
         uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe
         with:
-          name: docker-image-${{ matrix.ARCH }}.tar
+          name: sidecar-${{ matrix.ARCH }}.tar
 
       - name: Load images
-        run: docker load -i controller-${{ env.ARCH }}.tar
+        run: docker load -i sidecar-${{ env.ARCH }}.tar
 
       - name: Create cluster
         run: kind create cluster --image=kindest/node:${{ matrix.k8s }}
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index cb5d23e..d20a9fa 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -135,8 +135,8 @@ jobs:
         PLATFORM: [ amd64 ]
         RUNNER: [ self-hosted-amd64-1cpu ]
         include:
-          - { kubeVersion: 1.19.16, PLATFORM: aarch64, RUNNER: self-hosted-arm64-1cpu }
-          - { kubeVersion: 1.25.3,  PLATFORM: aarch64, RUNNER: self-hosted-arm64-1cpu }
+          - { kubeVersion: 1.19.16, PLATFORM: arm64, RUNNER: self-hosted-arm64-1cpu }
+          - { kubeVersion: 1.25.3,  PLATFORM: arm64, RUNNER: self-hosted-arm64-1cpu }
     steps:
       - name: Import secrets
         uses: hashicorp/vault-action@130d1f5f4fe645bb6c83e4225c04d64cfb62de6e # v2.5.0
diff --git a/Makefile b/Makefile
index d4e2c16..8dae737 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ ifndef CI
 	PLATFORMS?=linux/amd64
 	BUILDX_ARGS?=--load
 else
-	PLATFORMS?=linux/amd64,linux/aarch64
+	PLATFORMS?=linux/amd64,linux/arm64
 	BUILDX_ARGS?=--push
 endif