diff --git a/.github/workflows/fast_tests.yml b/.github/workflows/fast_tests.yml
index 990de2ccfb..b68d4b2dbb 100644
--- a/.github/workflows/fast_tests.yml
+++ b/.github/workflows/fast_tests.yml
@@ -15,8 +15,7 @@ concurrency:
 jobs:
   transformers:
     name: Run tests for optimum.habana.transformers
-    runs-on:
-      group: aws-dl1-24xlarge
+    runs-on: [self-hosted, linux, x64, gaudi2]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -38,8 +37,7 @@ jobs:
             /bin/bash tests/ci/fast_tests.sh
   diffusers:
     name: Run tests for optimum.habana.diffusers
-    runs-on:
-      group: aws-dl1-24xlarge
+    runs-on: [self-hosted, linux, x64, gaudi2]
     steps:
       - name: Checkout
         uses: actions/checkout@v2