diff --git a/.github/workflows/test_inf1_export.yml b/.github/workflows/test_inf1_export.yml
index 3512a5b1e..4fcf3a8b5 100644
--- a/.github/workflows/test_inf1_export.yml
+++ b/.github/workflows/test_inf1_export.yml
@@ -10,9 +10,8 @@ concurrency:
 jobs:
   do-the-job:
     name: Run INF1 export tests
-    runs-on: [self-hosted, 4-aws-inf1, 24-cpu, ci]
-    env:
-      AWS_REGION: us-east-1
+    runs-on:
+      group: aws-inf1-6xlarge
     steps:
       - name: Install Neuron runtime
         run: |
@@ -28,7 +27,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Install system packages
         run: |
-          sudo apt install python3.8-venv python3-dev -y
+          sudo apt install python3-venv python3-dev -y
       - name: Install python packages
         run: |
           python3 -m venv aws_neuron_venv_pytorch
diff --git a/.github/workflows/test_inf1_full_export.yml b/.github/workflows/test_inf1_full_export.yml
index fbaf70727..0498fe372 100644
--- a/.github/workflows/test_inf1_full_export.yml
+++ b/.github/workflows/test_inf1_full_export.yml
@@ -10,9 +10,8 @@ concurrency:
 jobs:
   do-the-job:
     name: Run INF1 full export tests
-    runs-on: [self-hosted, 4-aws-inf1, 24-cpu, ci]
-    env:
-      AWS_REGION: us-east-1
+    runs-on:
+      group: aws-inf1-6xlarge
     steps:
       - name: Install Neuron runtime
         run: |
@@ -28,7 +27,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Install system packages
         run: |
-          sudo apt install python3.8-venv python3-dev -y
+          sudo apt install python3-venv python3-dev -y
       - name: Install python packages
         run: |
           python3 -m venv aws_neuron_venv_pytorch
diff --git a/.github/workflows/test_inf1_inference.yml b/.github/workflows/test_inf1_inference.yml
index b587f8cd3..3b081e2df 100644
--- a/.github/workflows/test_inf1_inference.yml
+++ b/.github/workflows/test_inf1_inference.yml
@@ -10,9 +10,8 @@ concurrency:
 jobs:
   do-the-job:
     name: Run INF1 tests
-    runs-on: [self-hosted, 4-aws-inf1, 24-cpu, ci]
-    env:
-      AWS_REGION: us-east-1
+    runs-on:
+      group: aws-inf1-6xlarge
     steps:
       - name: Install Neuron runtime
         run: |
@@ -28,7 +27,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Install system packages
         run: |
-          sudo apt install python3.8-venv python3-dev -y
+          sudo apt install python3-venv python3-dev -y
       - name: Install python packages
         run: |
           python3 -m venv aws_neuron_venv_pytorch
diff --git a/.github/workflows/test_inf1_pipelines.yml b/.github/workflows/test_inf1_pipelines.yml
index 7351f8dcf..d4688fe1f 100644
--- a/.github/workflows/test_inf1_pipelines.yml
+++ b/.github/workflows/test_inf1_pipelines.yml
@@ -10,9 +10,8 @@ concurrency:
 jobs:
   do-the-job:
     name: Run INF1 tests
-    runs-on: [self-hosted, 4-aws-inf1, 24-cpu, ci]
-    env:
-      AWS_REGION: us-east-1
+    runs-on:
+      group: aws-inf1-6xlarge
     steps:
       - name: Install Neuron runtime
         run: |
@@ -28,7 +27,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Install system packages
         run: |
-          sudo apt install python3.8-venv python3-dev -y
+          sudo apt install python3-venv python3-dev -y
       - name: Install python packages
         run: |
           python3 -m venv aws_neuron_venv_pytorch
diff --git a/.github/workflows/test_inf2.yml b/.github/workflows/test_inf2.yml
index c709a30df..fbcc14e3e 100644
--- a/.github/workflows/test_inf2.yml
+++ b/.github/workflows/test_inf2.yml
@@ -6,11 +6,13 @@ on:
     paths:
       - "setup.py"
       - "optimum/**.py"
+      - ".github/workflows/test_inf2.yml"
   pull_request:
     branches: [ main ]
     paths:
       - "setup.py"
       - "optimum/**.py"
+      - ".github/workflows/test_inf2.yml"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -19,9 +21,8 @@ concurrency:
 jobs:
   do-the-job:
     name: Run INF2 tests
-    runs-on: [self-hosted, 1-aws-inf2, 32-cpu, ci] # run the job on the newly created runner
-    env:
-      AWS_REGION: us-east-1
+    runs-on:
+      group: aws-inf2-8xlarge
     steps:
       - name: Install Neuron runtime
         run: |
@@ -37,7 +38,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Install python dependencies
         run: |
-          sudo apt install python3.8-venv python3-dev -y
+          sudo apt install python3-venv python3-dev -y
           python3 -m venv aws_neuron_venv_pytorch
           source aws_neuron_venv_pytorch/bin/activate
           python -m pip install -U pip
diff --git a/.github/workflows/test_inf2_export.yml b/.github/workflows/test_inf2_export.yml
index 0d0d15e98..f7fc25206 100644
--- a/.github/workflows/test_inf2_export.yml
+++ b/.github/workflows/test_inf2_export.yml
@@ -6,6 +6,7 @@ on:
     paths:
       - "setup.py"
       - "optimum/**.py"
+      - ".github/workflows/test_inf2_export.yml"
   pull_request:
     branches: [ main ]
     paths:
diff --git a/.github/workflows/test_inf2_full_export.yml b/.github/workflows/test_inf2_full_export.yml
index b16274920..23ea4148f 100644
--- a/.github/workflows/test_inf2_full_export.yml
+++ b/.github/workflows/test_inf2_full_export.yml
@@ -5,10 +5,12 @@ on:
     branches: [ main ]
     paths:
       - "optimum/exporters/neuron/*.py"
+      - ".github/workflows/test_inf2_full_export.yml"
   pull_request:
     branches: [ main ]
     paths:
       - "optimum/exporters/neuron/*.py"
+      - ".github/workflows/test_inf2_full_export.yml"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -17,9 +19,8 @@ concurrency:
 jobs:
   do-the-job:
     name: Run INF2 full export tests
-    runs-on: [self-hosted, 1-aws-inf2, 32-cpu, ci] # run the job on the newly created runner
-    env:
-      AWS_REGION: us-east-1
+    runs-on:
+      group: aws-inf2-8xlarge
     steps:
       - name: Install Neuron runtime
         run: |
@@ -35,7 +36,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Install python dependencies
         run: |
-          sudo apt install python3.8-venv python3-dev -y
+          sudo apt install python3-venv python3-dev -y
           python3 -m venv aws_neuron_venv_pytorch
           source aws_neuron_venv_pytorch/bin/activate
           python -m pip install -U pip
diff --git a/.github/workflows/test_inf2_inference.yml b/.github/workflows/test_inf2_inference.yml
index 006a73110..ae9c3b8c0 100644
--- a/.github/workflows/test_inf2_inference.yml
+++ b/.github/workflows/test_inf2_inference.yml
@@ -6,11 +6,13 @@ on:
     paths:
       - "setup.py"
       - "optimum/**.py"
+      - ".github/workflows/test_inf2_inference.yml"
   pull_request:
     branches: [ main ]
     paths:
       - "setup.py"
       - "optimum/**.py"
+      - ".github/workflows/test_inf2_inference.yml"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -19,9 +21,8 @@ concurrency:
 jobs:
   do-the-job:
     name: Run INF2 tests
-    runs-on: [self-hosted, 1-aws-inf2, 32-cpu, ci] # run the job on the newly created runner
-    env:
-      AWS_REGION: us-east-1
+    runs-on:
+      group: aws-inf2-8xlarge
     steps:
       - name: Install Neuron runtime
         run: |
@@ -37,7 +38,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Install python dependencies
         run: |
-          sudo apt install python3.8-venv python3-dev -y
+          sudo apt install python3-venv python3-dev -y
           python3 -m venv aws_neuron_venv_pytorch
           source aws_neuron_venv_pytorch/bin/activate
           python -m pip install -U pip
diff --git a/.github/workflows/test_inf2_tgi.yml b/.github/workflows/test_inf2_tgi.yml
index 02691a828..79e3f5f26 100644
--- a/.github/workflows/test_inf2_tgi.yml
+++ b/.github/workflows/test_inf2_tgi.yml
@@ -7,12 +7,14 @@ on:
       - "setup.py"
       - "optimum/**.py"
       - "text-generation-inference/**"
+      - ".github/workflows/test_inf2_tgi.yml"
   pull_request:
     branches: [ main ]
     paths:
       - "setup.py"
       - "optimum/**.py"
       - "text-generation-inference/**"
+      - ".github/workflows/test_inf2_tgi.yml"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -21,9 +23,8 @@ concurrency:
 jobs:
   do-the-job:
     name: Run TGI tests
-    runs-on: [self-hosted, 1-aws-inf2, 32-cpu, ci] # run the job on the newly created runner
-    env:
-      AWS_REGION: us-east-1
+    runs-on:
+      group: aws-inf2-8xlarge
     steps:
       - name: Install Neuron runtime
         run: |
@@ -39,7 +40,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Install python and create venv
         run: |
-          sudo apt install python3.8-venv python3-dev -y
+          sudo apt install python3-venv python3-dev -y
           python3 -m venv aws_neuron_venv_pytorch
           source aws_neuron_venv_pytorch/bin/activate
           python -m pip install -U pip
diff --git a/.github/workflows/test_trainium_common.yml b/.github/workflows/test_trainium_common.yml
index 738d4d482..017f24a55 100644
--- a/.github/workflows/test_trainium_common.yml
+++ b/.github/workflows/test_trainium_common.yml
@@ -6,11 +6,13 @@ on:
     paths:
       - "setup.py"
       - "optimum/**.py"
+      - ".github/workflows/test_trainium_common.yml"
   pull_request:
     branches: [ main ]
     paths:
       - "setup.py"
       - "optimum/**.py"
+      - ".github/workflows/test_trainium_common.yml"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -19,9 +21,9 @@ concurrency:
 jobs:
   optimum-neuron-tests:
     name: Run common tests on Trainium 1
-    runs-on: [self-hosted, 16-aws-trn, 128-cpu, ci]
+    runs-on:
+      group: aws-trn1-32xlarge
     env:
-      AWS_REGION: us-east-1
       TESTS_TO_IGNORE_FLAGS: --ignore tests/distributed/ --ignore tests/test_examples.py
     steps:
       - name: Install Neuron runtime
@@ -38,7 +40,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Install python dependencies
         run: |
-          sudo apt install python3.8-venv python3-dev -y
+          sudo apt install python3-venv python3-dev -y
           python3 -m venv aws_neuron_venv_pytorch
           source aws_neuron_venv_pytorch/bin/activate
           python -m pip install -U pip
diff --git a/.github/workflows/test_trainium_distributed.yml b/.github/workflows/test_trainium_distributed.yml
index e6801b67b..4c4081733 100644
--- a/.github/workflows/test_trainium_distributed.yml
+++ b/.github/workflows/test_trainium_distributed.yml
@@ -6,11 +6,13 @@ on:
     paths:
       - "setup.py"
       - "optimum/neuron/distributed/**.py"
+      - ".github/workflows/test_trainium_distributed.yml"
   pull_request:
     branches: [ main ]
     paths:
       - "setup.py"
       - "optimum/neuron/distributed/**.py"
+      -  ".github/workflows/test_trainium_distributed.yml"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -20,9 +22,8 @@ concurrency:
 jobs:
   optimum-neuron-tests:
     name: Run distributed tests on Trainium 1
-    runs-on: [self-hosted, 16-aws-trn, 128-cpu, ci]
-    env:
-      AWS_REGION: us-east-1
+    runs-on:
+      group: aws-trn1-32xlarge
     steps:
       - name: Install Neuron runtime
         run: |
@@ -40,7 +41,7 @@ jobs:
         run: echo "/home/ubuntu/.local/bin" >> $GITHUB_PATH
       - name: Install python dependencies
         run: |
-          sudo apt install python3.8-venv python3-dev -y
+          sudo apt install python3-venv python3-dev -y
           python3 -m venv aws_neuron_venv_pytorch
           source aws_neuron_venv_pytorch/bin/activate
           python -m pip install -U pip
diff --git a/.github/workflows/test_trainium_examples.yml b/.github/workflows/test_trainium_examples.yml
index bb96965ed..52397a2ac 100644
--- a/.github/workflows/test_trainium_examples.yml
+++ b/.github/workflows/test_trainium_examples.yml
@@ -28,9 +28,9 @@ concurrency:
 jobs:
   optimum-neuron-tests:
     name: Run example script tests on Trainium 1
-    runs-on: [self-hosted, 1-aws-trn, 8-cpu, ci] # run the job on the newly created runner
+    runs-on:
+      group: aws-trn1-2xlarge
     env:
-      AWS_REGION: us-east-1
       RUN_TINY: ${{ github.event.inputs.model_size == "tiny" && "1" || "0" }}
     steps:
       - name: Install Neuron runtime
@@ -49,7 +49,7 @@ jobs:
         run: echo "/home/ubuntu/.local/bin" >> $GITHUB_PATH
       - name: Install python dependencies
         run: |
-          sudo apt install python3.8-venv python3-dev -y
+          sudo apt install python3-venv python3-dev -y
           python3 -m venv aws_neuron_venv_pytorch
           source aws_neuron_venv_pytorch/bin/activate
           python -m pip install -U pip