diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 97b7716b..490d0049 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -58,11 +58,9 @@ jobs:
       - name: Inject slug/short variables
         uses: rlespinasse/github-slug-action@v4.4.1
       - name: Tailscale
-        uses: huggingface/tailscale-action@ci-test
+        uses: huggingface/tailscale-action@main
         with:
-          oauth-client-id: kV3YYMqHyM11CNTRL
-          oauth-secret: tskey-client-kV3YYMqHyM11CNTRL-payJPrYdsGaVhRahyevcFaXj7kq8BEF6
-          tags: tag:ci
+          authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
@@ -70,12 +68,12 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      #- name: Login to internal Container Registry
-      #  uses: docker/login-action@v2.1.0
-      #  with:
-      #    username: ${{ secrets.TAILSCALE_DOCKER_USERNAME }}
-      #    password: ${{ secrets.TAILSCALE_DOCKER_PASSWORD }}
-      #    registry: registry.internal.huggingface.tech
+      - name: Login to internal Container Registry
+        uses: docker/login-action@v2.1.0
+        with:
+          username: ${{ secrets.TAILSCALE_DOCKER_USERNAME }}
+          password: ${{ secrets.TAILSCALE_DOCKER_PASSWORD }}
+          registry: registry.internal.huggingface.tech
       - name: Login to Azure Container Registry
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v2.1.0
@@ -141,3 +139,8 @@ jobs:
           export DOCKER_IMAGE=registry.internal.huggingface.tech/api-inference/community/text-generation-inference:sha-${{ env.GITHUB_SHA_SHORT }}
           export HUGGING_FACE_HUB_TOKEN=${{ secrets.HUGGING_FACE_HUB_TOKEN }}
           pytest -s -vv integration-tests
+      - name: Tailscale Wait
+        if: ${{ failure() || runner.debug == '1' }}
+        uses: huggingface/tailscale-action@main
+        with:
+          waitForSSH: true