diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 481c9f4ebe..bd370378ae 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -48,8 +48,7 @@ jobs:
 
   tag:
     needs: [ check-permissions ]
-    runs-on: [ self-hosted, gen3, small ]
-    container: 369495373322.dkr.ecr.eu-central-1.amazonaws.com/base:pinned
+    runs-on: ubuntu-latest
     outputs:
       build-tag: ${{steps.build-tag.outputs.tag}}
     permissions:
@@ -57,11 +56,11 @@ jobs:
       contents: read
 
     steps:
-      - name: Install az cli
-        run: |
-          curl -sL https://aka.ms/InstallAzureCLIDeb --output-dir /tmp -OJ
-          bash /tmp/InstallAzureCLIDeb
-
+      # - name: Install az cli
+      #   run: |
+      #     curl -sL https://aka.ms/InstallAzureCLIDeb --output-dir /tmp -OJ
+      #     bash /tmp/InstallAzureCLIDeb
+      #
       - uses: azure/login@6c251865b4e6290e7b78be643ea2d005bc51f69a # v2.1.1
         with:
           client-id: ${{ secrets.AZURE_DEV_RUNNER_CLIENT_ID }}