diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
index 1a6611f4..f958e4bd 100644
--- a/.github/workflows/push.yaml
+++ b/.github/workflows/push.yaml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
     inputs:
       image_tag:
-        description: 'Image tag name.'
+        description: "Image tag name."
         required: true
   release:
     types:
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Build:checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: "Set image tag name"
         run: |
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
@@ -28,38 +28,43 @@ jobs:
       - name: "Check image tag name"
         run: |
           echo "IMAGETAG=${{env.IMAGETAG}}"
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: "Build:buildx"
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
         with:
           version: v0.9.1 # Buildx version
       - name: "Build:login"
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: "Build:dockerimage"
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true
           file: Dockerfile.controller
           build-args: |
             GO_BUILDER_IMG=golang:1.19
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/grafana/k6-operator:latest,ghcr.io/grafana/k6-operator:controller-${{env.IMAGETAG}}
       - name: "Build:dockerimage"
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true
           file: Dockerfile.runner
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/grafana/k6-operator:latest-runner,ghcr.io/grafana/k6-operator:runner-${{env.IMAGETAG}}
       - name: "Build:dockerimage"
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true
           file: Dockerfile.starter
+          platforms: linux/amd64,linux/arm64
           tags: ghcr.io/grafana/k6-operator:latest-starter,ghcr.io/grafana/k6-operator:starter-${{env.IMAGETAG}}
 
   bundle:
@@ -70,7 +75,7 @@ jobs:
       pull-requests: write
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: "Set image tag name"
         run: |
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
diff --git a/Dockerfile.controller b/Dockerfile.controller
index abd72b34..62a15d5c 100644
--- a/Dockerfile.controller
+++ b/Dockerfile.controller
@@ -18,7 +18,7 @@ COPY pkg/ pkg/
 
 
 # Build
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager main.go
+RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -o manager main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
diff --git a/Dockerfile.runner b/Dockerfile.runner
index c8e6e186..2a2d8606 100644
--- a/Dockerfile.runner
+++ b/Dockerfile.runner
@@ -1,4 +1,4 @@
 FROM grafana/k6:latest
 
-COPY --from=redboxoss/scuttle:latest scuttle /bin/scuttle
+COPY --from=kvij/scuttle:latest scuttle /bin/scuttle
 ENTRYPOINT ["scuttle", "k6"]
diff --git a/Dockerfile.starter b/Dockerfile.starter
index d320b507..88e523d8 100644
--- a/Dockerfile.starter
+++ b/Dockerfile.starter
@@ -1,5 +1,5 @@
-FROM radial/busyboxplus:curl
+FROM curlimages/curl:latest
 
 # as defined by distroless for nonroot
 USER 65532:65532
-COPY --from=redboxoss/scuttle:latest /scuttle /bin/scuttle
+COPY --from=kvij/scuttle:latest /scuttle /bin/scuttle