diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d04bd32..c9a3777 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,9 +55,11 @@ jobs:
       TAG: ${{ (github.ref == 'refs/heads/main' && 'latest') || (github.ref == 'refs/heads/dev' && 'dev') || '' }}
     steps:
       - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
       - name: build images
         run: |
-          docker login --username featheredtoast --password ${{ secrets.DOCKER_PASSWORD }}
-          docker buildx build --push --load --tag featheredtoast/ficsit-remote-monitoring-cache:${{ env.TAG }} ./frmcache
-          docker buildx build --push --load --tag featheredtoast/ficsit-remote-monitoring-alertmanager-config:${{ env.TAG }} ./alertmanager-config
-          docker buildx build --push --load --tag featheredtoast/ficsit-remote-monitoring-companion:${{ env.TAG }} ./frmcompanion
+          docker login --username ${{ vars.DOCKERHUB_USERNAME }} --password ${{ secrets.DOCKER_PASSWORD }}
+          docker buildx build --push --platform linux/amd64,linux/arm64 --tag featheredtoast/ficsit-remote-monitoring-cache:${{ env.TAG }} ./frmcache
+          docker buildx build --push --platform linux/amd64,linux/arm64 --tag featheredtoast/ficsit-remote-monitoring-alertmanager-config:${{ env.TAG }} ./alertmanager-config
+          docker buildx build --push --platform linux/amd64,linux/arm64 --tag featheredtoast/ficsit-remote-monitoring-companion:${{ env.TAG }} ./frmcompanion