diff --git a/.github/workflows/toogoodtogo-ha-mqtt-bridge.yml b/.github/workflows/toogoodtogo-ha-mqtt-bridge.yml
index 7f01d0c..4c0ec80 100644
--- a/.github/workflows/toogoodtogo-ha-mqtt-bridge.yml
+++ b/.github/workflows/toogoodtogo-ha-mqtt-bridge.yml
@@ -5,38 +5,29 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Image Tag'     
+        description: "Image Tag"
         required: true
 
-
 jobs:
-
   toogoodtogo-ha-mqtt-bridge:
     runs-on: ubuntu-latest
 
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v2
-      -
-        name: Set up QEMU
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1 
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v2
+      - name: Build and push
+        uses: home-assistant/builder@master
         with:
-          context: toogoodtogo-ha-mqtt-bridge/
-          file: toogoodtogo-ha-mqtt-bridge/Dockerfile-real
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
-          push: true
-          tags: |
-            maxwinterstein/homeassistant-addon-toogoodtogo-ha-mqtt-bridge:${{ github.event.inputs.version }}
+          args: |
+            --all \
+            --target toogoodtogo-ha-mqtt-bridge \
+            --docker-hub maxwinterstein --version ${{ github.event.inputs.version }}
\ No newline at end of file