diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fddc9482adf..a16f4114bc4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,17 +14,14 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
-
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
     - name: Login to Docker Hub
       uses: docker/login-action@v3
       with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }} # TODO: use a GYG registry
-        password: ${{ secrets.DOCKERHUB_TOKEN }}    # TODO: use a GYG registry
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Build and push
       uses: docker/build-push-action@v6
@@ -33,5 +30,6 @@ jobs:
         file: tools/router-check-tool/Dockerfile
         context: .
         platforms: linux/amd64
-        push: ${{ startsWith(github.ref_name, 'release-') && github.event_name == 'push'}}
-        tags: cainelli/router_check_tool:${{ github.ref_name }}
+        push: true
+        # push: ${{ github.ref_name == github.event.repository.default_branch && github.event_name == 'push'}}
+        tags: getyourguide/router-check-tool:release-1.22