diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0216d872..3418abaa 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -29,22 +29,7 @@ jobs:
       run: make test
       env:
         KUBEBUILDER_ASSETS: ${{ github.workspace }}/kubebuilder/bin
-    - name: Setup QEMU
-      uses: docker/setup-qemu-action@v1
-      with:
-        platforms: all
-    - name: Setup Docker Buildx
-      id: buildx
-      uses: docker/setup-buildx-action@v1
-      with:
-        buildkitd-flags: "--debug"
-    - name: Build multi-arch container image
-      uses: docker/build-push-action@v2
-      with:
-        push: false
-        builder: ${{ steps.buildx.outputs.name }}
-        context: .
-        file: ./Dockerfile
-        platforms: linux/amd64,linux/arm/v7,linux/arm64
-        tags: |
-          ghcr.io/fluxcd/${{ github.event.repository.name }}:latest
+    - name: Build container image
+      run: make docker-build IMG=ghcr.io/fluxcd/${{ github.event.repository.name }}:latest
+      env:
+        KUBEBUILDER_ASSETS: ${{ github.workspace }}/kubebuilder/bin