diff --git a/.github/workflows/teslamate.yml b/.github/workflows/teslamate.yml
index 58ce677..7e7f511 100644
--- a/.github/workflows/teslamate.yml
+++ b/.github/workflows/teslamate.yml
@@ -39,7 +39,7 @@ jobs:
       run: docker version
     - name: Setup qemu
       id: qemu
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
       with:
         platforms: all
     - name: Install buildx
@@ -97,7 +97,7 @@ jobs:
           --label io.hass.url="https://github.com/matt-FFFFFF/hassio-addon-repository/blob/main/teslamate/README.md" \
           -t $DOCKER_USERNAME/teslamate-${{ matrix.arch }}:$ADDON_VERSION \
           ./
-      if: ${{ github.ref != 'refs/heads/main' && github.event_name == 'push' }}
+      if: ${{ github.ref != 'refs/heads/main' }}
     - name: Buildx build --push (if main or release)
       run: |
         DOCKER_CLI_EXPERIMENTAL=enabled sudo docker buildx build \