diff --git a/.github/workflows/commands-handler.yml b/.github/workflows/commands-handler.yml
index 4af75dfe3..14dec7efd 100644
--- a/.github/workflows/commands-handler.yml
+++ b/.github/workflows/commands-handler.yml
@@ -12,7 +12,7 @@ jobs:
     name: Process command
     if: github.event.issue.pull_request && endsWith(github.repository, '-private') != true
     runs-on:
-      group: Default
+      group: organization/Default
     steps:
       - name: Check referred user
         id: user-check
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0de07ba14..23fce9f3d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
     name: Check release required
     if: github.event.pull_request.merged && endsWith(github.repository, '-private') != true
     runs-on:
-      group: Default
+      group: organization/Default
     outputs:
       release: ${{ steps.check.outputs.ready }}
     steps:
@@ -36,7 +36,7 @@ jobs:
     needs: check-release
     if: needs.check-release.outputs.release == 'true'
     runs-on:
-      group: macos-gh
+      group: organization/macos-gh
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index b3c4a9778..1bfbb32fc 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -18,12 +18,12 @@ env:
   LANGUAGE: en_US.UTF-8
   LC_ALL: en_US.UTF-8
   LC_CTYPE: en_US.UTF-8
-  
+
 jobs:
   tests:
     name: Integration and Unit tests
     runs-on:
-      group: macos-gh
+      group: organization/macos-gh
     strategy:
       fail-fast: true
       matrix:
@@ -73,7 +73,7 @@ jobs:
   acceptance-tests:
     name: Run Acceptance tests
     runs-on:
-      group: macos-gh
+      group: organization/macos-gh
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -132,7 +132,7 @@ jobs:
     name: Tests
     needs: [tests, acceptance-tests]
     runs-on:
-      group: Default
+      group: organization/Default
     steps:
       - name: Tests summary
         run: echo -e "\033[38;2;95;215;0m\033[1mAll tests successfully passed"
diff --git a/.github/workflows/run-validations.yml b/.github/workflows/run-validations.yml
index 99b2461f9..44a90f647 100644
--- a/.github/workflows/run-validations.yml
+++ b/.github/workflows/run-validations.yml
@@ -14,7 +14,7 @@ jobs:
   pubnub-yml:
     name: "Validate .pubnub.yml"
     runs-on:
-      group: Default
+      group: organization/Default
     steps:
       - name: Checkout project
         uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
     name: Validations
     needs: [pubnub-yml]
     runs-on:
-      group: Default
+      group: organization/Default
     steps:
       - name: Validations summary
         run: echo -e "\033[38;2;95;215;0m\033[1mAll validations passed"