diff --git a/.github/workflows/integration-test-action.yaml b/.github/workflows/integration-test-action.yaml
index 2e3479fc..c6665d6b 100644
--- a/.github/workflows/integration-test-action.yaml
+++ b/.github/workflows/integration-test-action.yaml
@@ -39,11 +39,12 @@ on:
       runs_on:
         type: string
         required: false
-        default: '["single-gpu", "nvidia-gpu", "t4", "ci"]'
+        default: 'aws-g4dn-2xlarge-cache'
 
 jobs:
   pytorch-integration-tests:
-    runs-on: ${{ fromJson(inputs.runs_on) }}
+    runs-on:
+      group: ${{ inputs.runs_on }}
     env:
       AWS_REGION: ${{ inputs.region }}
       HF_HOME: ${{ inputs.hf_home }}
@@ -66,4 +67,4 @@ jobs:
         python -m pytest \
         ${{ inputs.test_path }} -n ${{ inputs.test_parallelism }} \
         --log-cli-level='${{ inputs.log_level }}' \
-        --log-format='${{ inputs.log_format }}'
\ No newline at end of file
+        --log-format='${{ inputs.log_format }}'
diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
index 5343b571..f4afbea7 100644
--- a/.github/workflows/integration-test.yaml
+++ b/.github/workflows/integration-test.yaml
@@ -35,7 +35,6 @@ jobs:
     with:
       test_path: "tests/integ/test_pytorch_remote_cpu.py"
       build_img_cmd: "make inference-pytorch-cpu"
-      runs_on: "['ci']"
   pytorch-integration-local-cpu:
     name: Local Integration Tests - CPU
     uses: ./.github/workflows/integration-test-action.yaml
@@ -43,4 +42,3 @@ jobs:
       test_path: "tests/integ/test_pytorch_local_cpu.py"
       build_img_cmd: "make inference-pytorch-cpu"
       test_parallelism: "1"
-      runs_on: "['ci']"
\ No newline at end of file
diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml
index 0c8db252..8b929cba 100644
--- a/.github/workflows/unit-test.yaml
+++ b/.github/workflows/unit-test.yaml
@@ -19,7 +19,8 @@ concurrency:
 
 jobs:
   pytorch-unit-test:
-    runs-on: [single-gpu, nvidia-gpu, t4, ci]
+    runs-on: 
+      group: aws-g4dn-2xlarge-cache
     env:
       AWS_REGION: us-east-1
       CACHE_TEST_DIR: /mnt/hf_cache/hf-inference-toolkit-tests
@@ -28,8 +29,9 @@ jobs:
     - uses: actions/checkout@v4.1.1
     - name: Copy unit tests to cache mount
       run: |
-        rm -rf ${{ env.CACHE_TEST_DIR }} && \
-        mkdir ${{ env.CACHE_TEST_DIR }} && \
+        sudo rm -rf ${{ env.CACHE_TEST_DIR }} && \
+        sudo mkdir ${{ env.CACHE_TEST_DIR }} && \
+        sudo chown -R runner ${{ env.CACHE_TEST_DIR }}
         cp -r tests ${{ env.CACHE_TEST_DIR }}
     - name: Docker Setup Buildx
       uses: docker/setup-buildx-action@v3.0.0