diff --git a/.github/workflows/build-container.yaml b/.github/workflows/build-container.yaml
index 04cb4147..145d7389 100644
--- a/.github/workflows/build-container.yaml
+++ b/.github/workflows/build-container.yaml
@@ -22,7 +22,6 @@ jobs:
       dockerfile: dockerfiles/pytorch/Dockerfile
       build_args: "BASE_IMAGE=ubuntu:22.04"
     secrets:
-      TAILSCALE_AUTHKEY: ${{ secrets.TAILSCALE_AUTHKEY }}
       REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
       REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
   starlette-pytorch-gpu:
@@ -31,7 +30,6 @@ jobs:
       image: inference-pytorch-gpu
       dockerfile: dockerfiles/pytorch/Dockerfile
     secrets:
-      TAILSCALE_AUTHKEY: ${{ secrets.TAILSCALE_AUTHKEY }}
       REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
       REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
   starlette-pytorch-inf2:
@@ -40,6 +38,5 @@ jobs:
       image: inference-pytorch-inf2
       dockerfile: dockerfiles/pytorch/Dockerfile.inf2
     secrets:
-      TAILSCALE_AUTHKEY: ${{ secrets.TAILSCALE_AUTHKEY }}
       REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
       REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
\ No newline at end of file
diff --git a/.github/workflows/docker-build-action.yaml b/.github/workflows/docker-build-action.yaml
index fe644056..9361b56d 100644
--- a/.github/workflows/docker-build-action.yaml
+++ b/.github/workflows/docker-build-action.yaml
@@ -25,23 +25,15 @@ on:
         required: true
       REGISTRY_PASSWORD:
         required: true
-      TAILSCALE_AUTHKEY:
-        required: true
 
 jobs:
   buildx:
-    runs-on: [single-gpu, nvidia-gpu, t4, ci]
+    runs-on: 
+      group: aws-highmemory-32-plus-priv
     steps:
       - name: Check out
         uses: actions/checkout@v3
 
-      - name: Tailscale
-        uses: huggingface/tailscale-action@v1
-        with:
-          authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
-          slackChannel: ${{ secrets.SLACK_CIFEEDBACK_CHANNEL }}
-          slackToken: ${{ secrets.SLACK_CIFEEDBACK_BOT_TOKEN }}
-          
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2.0.0
         with:
@@ -66,9 +58,4 @@ jobs:
           target: base
           file:  ${{ inputs.context }}/${{ inputs.dockerfile }}
           tags: ${{ inputs.repository }}/${{ inputs.image }}:sha-${{ env.GITHUB_SHA_SHORT }},${{ inputs.repository }}/${{ inputs.image }}:latest
-     
-      - name: Tailscale Wait
-        if: ${{ failure() || runner.debug == '1' }}
-        uses: huggingface/tailscale-action@v1
-        with:
-           waitForSSH: true
+    
diff --git a/dockerfiles/pytorch/Dockerfile.inf2 b/dockerfiles/pytorch/Dockerfile.inf2
index bb8459ec..38957055 100644
--- a/dockerfiles/pytorch/Dockerfile.inf2
+++ b/dockerfiles/pytorch/Dockerfile.inf2
@@ -1,5 +1,5 @@
 # Build based on https://github.com/aws/deep-learning-containers/blob/master/huggingface/pytorch/inference/docker/2.1/py3/sdk2.18.0/Dockerfile.neuronx
-FROM ubuntu:20.04
+FROM ubuntu:20.04 as base
 
 LABEL maintainer="Hugging Face"
 
@@ -119,4 +119,4 @@ COPY src/huggingface_inference_toolkit/webservice_starlette.py webservice_starle
 # copy entrypoint and change permissions
 COPY --chmod=0755  scripts/entrypoint.sh entrypoint.sh
 
-ENTRYPOINT ["bash", "-c", "./entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["bash", "-c", "./entrypoint.sh"]