diff --git a/.github/workflows/ci-3p-django-framework.yml b/.github/workflows/ci-3p-django-framework.yml
index f4e7b4af9..99fe7ae59 100644
--- a/.github/workflows/ci-3p-django-framework.yml
+++ b/.github/workflows/ci-3p-django-framework.yml
@@ -65,7 +65,7 @@ jobs:
 
     - name: Wait for cache
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "Wating for cache '${BLDCACHE}' ..."
         sleep $(( $RANDOM / 1024 ))
@@ -124,7 +124,7 @@ jobs:
         
     - name: Check baseline
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         set +e
         
diff --git a/.github/workflows/ci-3p-laravel-framework.yml b/.github/workflows/ci-3p-laravel-framework.yml
index b179b707d..f4b61b0be 100644
--- a/.github/workflows/ci-3p-laravel-framework.yml
+++ b/.github/workflows/ci-3p-laravel-framework.yml
@@ -65,7 +65,7 @@ jobs:
 
     - name: Wait for cache
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "Wating for cache '${BLDCACHE}' ..."
         sleep $(( $RANDOM / 1024 ))
@@ -129,7 +129,7 @@ jobs:
         
     - name: Check baseline
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         cd proxysql_3p_testing/test_laravel-framework
 
diff --git a/.github/workflows/ci-3p-mariadb-connector-c.yml b/.github/workflows/ci-3p-mariadb-connector-c.yml
index ec035b0ea..f26b811f6 100644
--- a/.github/workflows/ci-3p-mariadb-connector-c.yml
+++ b/.github/workflows/ci-3p-mariadb-connector-c.yml
@@ -65,7 +65,7 @@ jobs:
 
     - name: Wait for cache
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "Wating for cache '${BLDCACHE}' ..."
         sleep $(( $RANDOM / 1024 ))
@@ -123,7 +123,7 @@ jobs:
         
     - name: Check baseline
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         cd proxysql_3p_testing/test_mariadb-connector-c
         BASELINE=$(gh variable -R ${{ github.repository }} list | grep -i BASELINE_3P_MARIADB_CONNECTOR_C_${INFRADB//./}_${CONNECTOR//./} | awk '{ print $2 }')
diff --git a/.github/workflows/ci-3p-mysql-connector-j.yml b/.github/workflows/ci-3p-mysql-connector-j.yml
index 7a8ac48eb..0149a42c9 100644
--- a/.github/workflows/ci-3p-mysql-connector-j.yml
+++ b/.github/workflows/ci-3p-mysql-connector-j.yml
@@ -65,7 +65,7 @@ jobs:
 
     - name: Wait for cache
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "Wating for cache '${BLDCACHE}' ..."
         sleep $(( $RANDOM / 1024 ))
@@ -114,7 +114,7 @@ jobs:
         
     - name: Check baseline
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         cd proxysql_3p_testing/test_mysql-connector-j
         BASELINE=$(gh variable -R ${{ github.repository }} list | grep -i BASELINE_3P_MYSQL_CONNECTOR_J_${INFRADB//./}_${CONNECTOR//./} | awk '{ print $2 }')
diff --git a/.github/workflows/ci-3p-php-pdo-mysql.yml b/.github/workflows/ci-3p-php-pdo-mysql.yml
index 1f269cb36..683e50905 100644
--- a/.github/workflows/ci-3p-php-pdo-mysql.yml
+++ b/.github/workflows/ci-3p-php-pdo-mysql.yml
@@ -65,7 +65,7 @@ jobs:
 
     - name: Wait for cache
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "Wating for cache '${BLDCACHE}' ..."
         sleep $(( $RANDOM / 1024 ))
@@ -114,7 +114,7 @@ jobs:
         
     - name: Check baseline
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         cd proxysql_3p_testing/test_php-pdo-mysql
         BASELINE=$(gh variable -R ${{ github.repository }} list | grep -i BASELINE_3P_PHP_PDO_MYSQL_${INFRADB//./}_${CONNECTOR//./} | awk '{ print $2 }')
diff --git a/.github/workflows/ci-3p-postgresql.yml b/.github/workflows/ci-3p-postgresql.yml
index a69ddae29..8126f1dd2 100644
--- a/.github/workflows/ci-3p-postgresql.yml
+++ b/.github/workflows/ci-3p-postgresql.yml
@@ -62,7 +62,7 @@ jobs:
 
     - name: Wait for cache
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "Wating for cache '${BLDCACHE}' ..."
         sleep $(( $RANDOM / 1024 ))
@@ -121,7 +121,7 @@ jobs:
         
     - name: Check baseline
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         cd proxysql_3p_testing/test_postgresql
         BASELINE=$(gh variable -R ${{ github.repository }} list | grep -i BASELINE_3P_POSTGRESQL_${INFRADB//./}_${CONNECTOR//./} | awk '{ print $2 }')
diff --git a/.github/workflows/ci-3p-sqlalchemy.yml b/.github/workflows/ci-3p-sqlalchemy.yml
index 3c612dc0f..baca55536 100644
--- a/.github/workflows/ci-3p-sqlalchemy.yml
+++ b/.github/workflows/ci-3p-sqlalchemy.yml
@@ -70,7 +70,7 @@ jobs:
     - name: Wait for cache
       if: ${{ env.BRANCH != 'none' }}
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "Wating for cache '${BLDCACHE}' ..."
         sleep $(( $RANDOM / 1024 ))
@@ -119,7 +119,7 @@ jobs:
       if: ${{ !cancelled() }}
       id: check_baseline
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         cd proxysql_3p_testing/test_sqlalchemy
         #BASELINE=$(gh variable -R ${{ github.repository }} list | grep -i BASELINE_3P_SQLALCHEMY_${INFRADB//./}_${CONNECTOR//./} | awk '{ print $2 }')
diff --git a/.github/workflows/ci-basictests.yml b/.github/workflows/ci-basictests.yml
index 01a7de907..477a978c7 100644
--- a/.github/workflows/ci-basictests.yml
+++ b/.github/workflows/ci-basictests.yml
@@ -65,7 +65,7 @@ jobs:
 
     - name: Wait for cache
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "BASELINE: '${BASELINE}'"
         echo "Wating for cache '${BLDCACHE}' ..."
diff --git a/.github/workflows/ci-builds.yml b/.github/workflows/ci-builds.yml
index 73bdd21c8..4984d70ef 100644
--- a/.github/workflows/ci-builds.yml
+++ b/.github/workflows/ci-builds.yml
@@ -18,7 +18,7 @@ jobs:
 #  lock:
 #    runs-on: ubuntu-22.04
 #    env:
-#      GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+#      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 #
 #    steps:
 #
@@ -243,7 +243,7 @@ jobs:
 #    if: ${{ always() }}
 #    needs: [ builds ]
 #    env:
-#      GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+#      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 #
 #    steps:
 #    
diff --git a/.github/workflows/ci-codeql.yml b/.github/workflows/ci-codeql.yml
index 91031cc8c..9fa9f0bc0 100644
--- a/.github/workflows/ci-codeql.yml
+++ b/.github/workflows/ci-codeql.yml
@@ -64,7 +64,7 @@ jobs:
 
     - name: Wait for cache
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "BASELINE: '${BASELINE}'"
         echo "Wating for cache '${BLDCACHE}' ..."
@@ -100,7 +100,7 @@ jobs:
 #    - if: matrix.language == 'cpp' 
 #      name: Git describe
 #      env:
-#        GH_TOKEN: ${{ github.GH_TOKEN_SYSOWN }}
+#        GH_TOKEN: ${{ github.GITHUB_TOKEN }}
 #      run: |
 #        export VERS=$(git ls-remote https://github.com/${{ github.repository }}.git "refs/tags/*" | grep -v 'refs/tags/v' | sed -e 's|.*/||g' | tail -2 | head -1)
 #        export HASH=$(gh api repos/${{ github.repository }}/git/refs/heads/v2.x | jq '.object.sha' | cut -c2-8)
diff --git a/.github/workflows/ci-package-build.yml b/.github/workflows/ci-package-build.yml
index 8359b18f8..60d9a419f 100644
--- a/.github/workflows/ci-package-build.yml
+++ b/.github/workflows/ci-package-build.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
     - name: Clean packages
       env:
-        GITHUB_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         # gh release delete-asset ${BRANCH}-head
         gh release delete ${BRANCH}-head --repo ${{ github.repository }} --cleanup-tag || true
@@ -119,7 +119,7 @@ jobs:
     - name: Update release
       if: ${{ !cancelled() }}
       env:
-        GITHUB_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         if [[ "${{ matrix.dist }}" = "centos9" ]] && [[ "${{ matrix.type }}" = "" ]]; then
         gh release edit ${BRANCH}-head --draft --prerelease --repo ${{ github.repository }} --tag ${BRANCH}-head --title "${BRANCH}-head - ${GIT_VERSION}" --notes-file - << EOF
@@ -146,7 +146,7 @@ jobs:
 
     - name: Push packages
       env:
-        GITHUB_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         # git tag --force -a ${BRANCH}-head -m 'GH-Actions - Development Snapshot Build'
         # git push origin --tags
@@ -170,7 +170,7 @@ jobs:
     steps:
     - name: Update release
       env:
-        GITHUB_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         GIT_VERSION=$(gh release --repo ${{ github.repository }} view ${BRANCH}-head | tr -d '*' | grep -Po "(?<=Version : ).*")
         gh release edit ${BRANCH}-head --draft --prerelease --repo ${{ github.repository }} --tag ${BRANCH}-head --notes-file - << EOF
diff --git a/.github/workflows/ci-repltests.yml b/.github/workflows/ci-repltests.yml
index e39d4a3f6..c3e344d32 100644
--- a/.github/workflows/ci-repltests.yml
+++ b/.github/workflows/ci-repltests.yml
@@ -46,7 +46,7 @@ jobs:
       
     - name: Wait for cache
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "BASELINE: '${BASELINE}'"
         echo "Wating for cache '${BLDCACHE}' ..."
diff --git a/.github/workflows/ci-selftests.yml b/.github/workflows/ci-selftests.yml
index 0ec5be8ea..0697ac695 100644
--- a/.github/workflows/ci-selftests.yml
+++ b/.github/workflows/ci-selftests.yml
@@ -41,7 +41,7 @@ jobs:
     
     - name: Wait for cache
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "BASELINE: '${BASELINE}'"
         echo "Wating for cache '${BLDCACHE}' ..."
diff --git a/.github/workflows/ci-shuntest.yml b/.github/workflows/ci-shuntest.yml
index b2f6f265f..1c098ba7d 100644
--- a/.github/workflows/ci-shuntest.yml
+++ b/.github/workflows/ci-shuntest.yml
@@ -46,7 +46,7 @@ jobs:
 
     - name: Wait for cache
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "BASELINE: '${BASELINE}'"
         echo "Wating for cache '${BLDCACHE}' ..."
diff --git a/.github/workflows/ci-taptests-asan.yml b/.github/workflows/ci-taptests-asan.yml
index 7e021c251..8dfb8b317 100644
--- a/.github/workflows/ci-taptests-asan.yml
+++ b/.github/workflows/ci-taptests-asan.yml
@@ -32,7 +32,7 @@ jobs:
 
     - name: Wait for cache
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "Wating for cache '${BLDCACHE}' ..."
         sleep $(( $RANDOM / 1024 ))
diff --git a/.github/workflows/ci-taptests-groups.yml b/.github/workflows/ci-taptests-groups.yml
index d8946e211..78ec3a24a 100644
--- a/.github/workflows/ci-taptests-groups.yml
+++ b/.github/workflows/ci-taptests-groups.yml
@@ -32,7 +32,7 @@ jobs:
 
     - name: Wait for cache
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "Wating for cache '${BLDCACHE}' ..."
         sleep $(( $RANDOM / 1024 ))
diff --git a/.github/workflows/ci-taptests-old.yml b/.github/workflows/ci-taptests-old.yml
index 8b0c64e47..62e72f4fa 100644
--- a/.github/workflows/ci-taptests-old.yml
+++ b/.github/workflows/ci-taptests-old.yml
@@ -63,7 +63,7 @@ jobs:
         ref: 'kubernetes'
 #        fetch-depth: 0
         path: 'jenkins-build-scripts'
-        token: ${{ secrets.GH_TOKEN_SYSOWN }}
+        token: ${{ secrets.GH_TOKEN_PROXYSQL }}
         submodules: 'false'
 
     - name: Patch TAP-tests
diff --git a/.github/workflows/ci-taptests-ssl.yml b/.github/workflows/ci-taptests-ssl.yml
index 00dd665bb..c2afc1d88 100644
--- a/.github/workflows/ci-taptests-ssl.yml
+++ b/.github/workflows/ci-taptests-ssl.yml
@@ -31,7 +31,7 @@ jobs:
 
     - name: Wait for cache
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "Wating for cache '${BLDCACHE}' ..."
         sleep $(( $RANDOM / 1024 ))
diff --git a/.github/workflows/ci-taptests.yml b/.github/workflows/ci-taptests.yml
index df1403488..00e0c14b3 100644
--- a/.github/workflows/ci-taptests.yml
+++ b/.github/workflows/ci-taptests.yml
@@ -33,7 +33,7 @@ jobs:
 
     - name: Wait for cache
       env:
-        GH_TOKEN: ${{ secrets.GH_TOKEN_SYSOWN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         echo "Wating for cache '${BLDCACHE}' ..."
         sleep $(( $RANDOM / 1024 ))