diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c847a2f..bacfc95 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,13 +25,21 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Push to Docker Hub
-        uses: docker/build-push-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: michaelwoods/onstar2mqtt
-          tags: michaelwoods/onstar2mqtt:latest
       - run: npm ci
       - run: npm run build --if-present
       - run: npm test
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Push to Docker Hub
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: michaelwoods/onstar2mqtt:latest