diff --git a/.github/workflows/commands-handler.yml b/.github/workflows/commands-handler.yml
index 48f71d24a..51f8668fa 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 0d28338e3..b02a69c04 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,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:
@@ -31,7 +31,7 @@ jobs:
     needs: check-release
     if: needs.check-release.outputs.release == 'true'
     runs-on:
-      group: windows-gh
+      group: organization/windows-gh
     defaults:
       run:
         shell: powershell
@@ -69,7 +69,7 @@ jobs:
     name: Publish package
     needs: publish-nuget
     runs-on:
-      group: Default
+      group: organization/Default
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 82d6f87ab..605e6040a 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -11,7 +11,7 @@ jobs:
   tests:
     name: Integration and Unit tests
     runs-on:
-      group: windows-gh
+      group: organization/windows-gh
     defaults:
       run:
         shell: powershell
@@ -51,7 +51,7 @@ jobs:
   acceptance-tests:
     name: Acceptance tests
     runs-on:
-      group: windows-gh
+      group: organization/windows-gh
     defaults:
       run:
         shell: powershell
@@ -107,7 +107,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 929f49cc3..41d01dea8 100644
--- a/.github/workflows/run-validations.yml
+++ b/.github/workflows/run-validations.yml
@@ -11,7 +11,7 @@ jobs:
   pubnub-yml:
     name: "Validate .pubnub.yml"
     runs-on:
-      group: Default
+      group: organization/Default
     steps:
       - name: Checkout project
         uses: actions/checkout@v4
@@ -33,7 +33,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"