diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 497fdea5..ba383202 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
-*         @xavrax @parfeon @seba-aln
+*         @xavrax @parfeon @seba-aln @kgronek-pubnub
 README.md @techwritermat @kazydek @xavrax @parfeon
diff --git a/.github/workflows/commands-handler.yml b/.github/workflows/commands-handler.yml
index 48f71d24..51f8668f 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 21bb7ef6..57643b37 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: 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 51dffaca..66fe81d8 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -20,9 +20,9 @@ jobs:
       matrix:
         runner:
           - os: ubuntu-latest
-            group: Default
+            group: organization/Default
 #          - os: macos-13
-#            group: macos-gh
+#            group: organization/macos-gh
     steps:
       - name: Checkout project
         uses: actions/checkout@v3
@@ -50,7 +50,7 @@ jobs:
   acceptance-tests:
     name: Acceptance tests
     runs-on:
-      group: Default
+      group: organization/Default
     steps:
       - name: Setup environment
         shell: bash
@@ -133,7 +133,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 test successfully passed"
diff --git a/.github/workflows/run-validations.yml b/.github/workflows/run-validations.yml
index 07873c9f..bdba8ea1 100644
--- a/.github/workflows/run-validations.yml
+++ b/.github/workflows/run-validations.yml
@@ -6,7 +6,7 @@ jobs:
   pubnub-yml:
     name: "Validate .pubnub.yml"
     runs-on:
-      group: Default
+      group: organization/Default
     steps:
       - name: Checkout project
         uses: actions/checkout@v4
@@ -28,7 +28,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"