diff --git a/.github/workflows/ci-3p-django-framework.yml b/.github/workflows/ci-3p-django-framework.yml
index a3d45287b..5d5eb3fd3 100644
--- a/.github/workflows/ci-3p-django-framework.yml
+++ b/.github/workflows/ci-3p-django-framework.yml
@@ -14,7 +14,7 @@ on:
 env:
   TESTNAME: django-framework
   TESTDIST: debian12
-  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
 
 jobs:
   test:
@@ -29,7 +29,7 @@ jobs:
       INFRADB: ${{ matrix.infradb }}
       CONNECTOR: ${{ matrix.connector }}
 #      BLDCACHE: ${{ github.sha }}_debian12_bin
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_debian12_bin
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin
 
     steps:
         
@@ -74,6 +74,8 @@ jobs:
         cd proxysql_3p_testing/
         #git sparse-checkout list
         ./setup.sh test_django-framework
+        
+        # use cached build
         rm -rf ./proxysql && mv ../proxysql .
         
         # extend timout
@@ -136,7 +138,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
         path: |
           proxysql_3p_testing/test_django-framework/logs
           
diff --git a/.github/workflows/ci-3p-laravel-framework.yml b/.github/workflows/ci-3p-laravel-framework.yml
index d90bba555..67c44acfb 100644
--- a/.github/workflows/ci-3p-laravel-framework.yml
+++ b/.github/workflows/ci-3p-laravel-framework.yml
@@ -14,6 +14,7 @@ on:
 env:
   TESTNAME: laravel-framework
   TESTDIST: debian12
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
 
 jobs:
   test:
@@ -27,7 +28,7 @@ jobs:
     env:
       INFRADB: ${{ matrix.infradb }}
       CONNECTOR: ${{ matrix.connector }}
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_debian12_bin
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin
 
     steps:
         
@@ -72,6 +73,8 @@ jobs:
         cd proxysql_3p_testing/
         git sparse-checkout list
         ./setup.sh test_laravel-framework/laravel-framework
+        
+        # use cached build
         rm -rf ./proxysql && mv ../proxysql .
         
         # extend timout
@@ -132,7 +135,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
         path: |
           proxysql_3p_testing/test_laravel-framework/logs
           
diff --git a/.github/workflows/ci-3p-laravel-framework_mariadb.yml b/.github/workflows/ci-3p-laravel-framework_mariadb.yml
index 3752aa0a3..47922eb04 100644
--- a/.github/workflows/ci-3p-laravel-framework_mariadb.yml
+++ b/.github/workflows/ci-3p-laravel-framework_mariadb.yml
@@ -7,6 +7,7 @@ on:
 env:
   TESTNAME: laravel-framework
   TESTDIST: debian12
+  SHA: ${{ github.sha }}
 
 jobs:
   test:
@@ -65,6 +66,8 @@ jobs:
         cd proxysql_3p_testing/
         git sparse-checkout list
         ./setup.sh test_laravel-framework/laravel-framework
+        
+        # use cached build
         rm -rf ./proxysql && mv ../proxysql .
         
         # set minor DB image version
@@ -116,7 +119,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ github.sha }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
         path: |
           proxysql_3p_testing/test_laravel-framework/logs
           
diff --git a/.github/workflows/ci-3p-laravel-framework_mysql.yml b/.github/workflows/ci-3p-laravel-framework_mysql.yml
index 4211d7a36..03c21ff55 100644
--- a/.github/workflows/ci-3p-laravel-framework_mysql.yml
+++ b/.github/workflows/ci-3p-laravel-framework_mysql.yml
@@ -7,6 +7,7 @@ on:
 env:
   TESTNAME: laravel-framework
   TESTDIST: debian12
+  SHA: ${{ github.sha }}
 
 jobs:
   test:
@@ -65,6 +66,8 @@ jobs:
         cd proxysql_3p_testing/
         git sparse-checkout list
         ./setup.sh test_laravel-framework/laravel-framework
+        
+        # use cached build
         rm -rf ./proxysql && mv ../proxysql .
         
         # extend timout
@@ -125,7 +128,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ github.sha }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
         path: |
           proxysql_3p_testing/test_laravel-framework/logs
           
diff --git a/.github/workflows/ci-3p-mariadb-connector-c.yml b/.github/workflows/ci-3p-mariadb-connector-c.yml
index 00915b358..1c8f94082 100644
--- a/.github/workflows/ci-3p-mariadb-connector-c.yml
+++ b/.github/workflows/ci-3p-mariadb-connector-c.yml
@@ -14,6 +14,7 @@ on:
 env:
   TESTNAME: mariadb-connector-c
   TESTDIST: debian12
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
 
 jobs:
   test:
@@ -27,7 +28,7 @@ jobs:
     env:
       INFRADB: ${{ matrix.infradb }}
       CONNECTOR: ${{ matrix.connector }}
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_debian12_bin
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin
       
     steps:
         
@@ -41,7 +42,7 @@ jobs:
         token: ${{ secrets.gh_token }}
         sparse-checkout: |
           test_mariadb-connector-c
-          proxysql
+#          proxysql
 
     - name: Wait for cache
       env:
@@ -72,8 +73,11 @@ jobs:
         cd proxysql_3p_testing/
         git sparse-checkout list
         ./setup.sh
-        git -C ./proxysql switch v2.x
-        git -C ./proxysql pull --tags
+        #git -C ./proxysql switch ${{ env.SHA }}
+        #git -C ./proxysql pull --tags
+        
+        # use cached build
+        rm -rf ./proxysql && mv ../proxysql .
         
         # extend timout
         cd test_mariadb-connector-c
@@ -124,7 +128,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
         path: |
           proxysql_3p_testing/test_mariadb-connector-c/logs
           
diff --git a/.github/workflows/ci-3p-mysql-connector-j.yml b/.github/workflows/ci-3p-mysql-connector-j.yml
index 99d5633c6..1c031cd30 100644
--- a/.github/workflows/ci-3p-mysql-connector-j.yml
+++ b/.github/workflows/ci-3p-mysql-connector-j.yml
@@ -14,6 +14,7 @@ on:
 env:
   TESTNAME: mysql-connector-j
   TESTDIST: debian12
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
 
 jobs:
   test:
@@ -27,7 +28,7 @@ jobs:
     env:
       INFRADB: ${{ matrix.infradb }}
       CONNECTOR: ${{ matrix.connector }}
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_debian12_bin
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin
 
     steps:
         
@@ -41,7 +42,7 @@ jobs:
         token: ${{ secrets.gh_token }}
         sparse-checkout: |
           test_mysql-connector-j
-          proxysql
+#          proxysql
 
     - name: Wait for cache
       env:
@@ -73,6 +74,9 @@ jobs:
         git sparse-checkout list
         ./setup.sh
         
+        # use cached build
+        rm -rf ./proxysql && mv ../proxysql .
+        
         # extend timout
         cd test_mysql-connector-j
         sed -i 's/timeout -v -s1 800 //' run-tests.bash
@@ -115,7 +119,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
         path: |
           proxysql_3p_testing/test_mysql-connector-j/logs
           
diff --git a/.github/workflows/ci-3p-php-pdo-mysql.yml b/.github/workflows/ci-3p-php-pdo-mysql.yml
index 5647b502d..49f416de3 100644
--- a/.github/workflows/ci-3p-php-pdo-mysql.yml
+++ b/.github/workflows/ci-3p-php-pdo-mysql.yml
@@ -14,6 +14,7 @@ on:
 env:
   TESTNAME: php-pdo-mysql
   TESTDIST: debian12
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
 
 jobs:
   test:
@@ -27,7 +28,7 @@ jobs:
     env:
       INFRADB:  ${{ matrix.infradb }}
       CONNECTOR:  ${{ matrix.connector }}
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_debian12_bin
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin
 
     steps:
         
@@ -41,7 +42,7 @@ jobs:
         token: ${{ secrets.gh_token }}
         sparse-checkout: |
           test_php-pdo-mysql
-          proxysql
+#          proxysql
 
     - name: Wait for cache
       env:
@@ -73,6 +74,9 @@ jobs:
         git sparse-checkout list
         ./setup.sh
         
+        # use cached build
+        rm -rf ./proxysql && mv ../proxysql .
+
         # extend timout
         cd test_php-pdo-mysql
         sed -i 's/timeout -v -s1 800 //' run-tests.bash
@@ -115,7 +119,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-${{ matrix.infradb }}-${{ matrix.connector }}logs-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-${{ matrix.infradb }}-${{ matrix.connector }}logs-run#${{ github.run_number }}
         path: |
           proxysql_3p_testing/test_php-pdo-mysql/logs
           
diff --git a/.github/workflows/ci-3p-sqlalchemy.yml b/.github/workflows/ci-3p-sqlalchemy.yml
index 2fde47147..b43536220 100644
--- a/.github/workflows/ci-3p-sqlalchemy.yml
+++ b/.github/workflows/ci-3p-sqlalchemy.yml
@@ -14,6 +14,8 @@ on:
 env:
   TESTNAME: sqlalchemy
   TESTDIST: debian12
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+  SUMMARY:
 
 jobs:
   test:
@@ -27,7 +29,7 @@ jobs:
     env:
       INFRADB:  ${{ matrix.infradb }}
       CONNECTOR: ${{ matrix.connector }}
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_debian12_bin
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_debian12_bin
     outputs:
       summary: ${{ steps.check_baseline.outputs.summary }}
 
@@ -76,7 +78,7 @@ jobs:
         ./setup.sh test_sqlalchemy/sqlalchemy
 
         # use cached build
-        rm -rf ./proxysql  && mv ../proxysql .
+        rm -rf ./proxysql && mv ../proxysql .
                 
     - name: Run tests
       run: |
@@ -135,7 +137,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
         path: |
           proxysql_3p_testing/test_sqlalchemy/logs
           
diff --git a/.github/workflows/ci-3p-sqlalchemy_mariadb.yml b/.github/workflows/ci-3p-sqlalchemy_mariadb.yml
index 146ccebbd..81ec24d61 100644
--- a/.github/workflows/ci-3p-sqlalchemy_mariadb.yml
+++ b/.github/workflows/ci-3p-sqlalchemy_mariadb.yml
@@ -7,6 +7,7 @@ on:
 env:
   TESTNAME: sqlalchemy
   TESTDIST: debian12
+  SHA: ${{ github.sha }}
 
 jobs:
   test:
@@ -67,7 +68,7 @@ jobs:
         ./setup.sh test_sqlalchemy/sqlalchemy
 
         # use cached build
-        rm -rf ./proxysql  && mv ../proxysql .
+        rm -rf ./proxysql && mv ../proxysql .
 
         # set minor DB image version
         #sed -i "s/${INFRADB#.*}/${INFRADB}/" ./test_sqlalchemy/docker-compose.yml
@@ -118,7 +119,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ github.sha }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
         path: |
           proxysql_3p_testing/test_sqlalchemy/logs
           
diff --git a/.github/workflows/ci-3p-sqlalchemy_mysql.yml b/.github/workflows/ci-3p-sqlalchemy_mysql.yml
index e80345dc8..ba1fd886c 100644
--- a/.github/workflows/ci-3p-sqlalchemy_mysql.yml
+++ b/.github/workflows/ci-3p-sqlalchemy_mysql.yml
@@ -7,6 +7,7 @@ on:
 env:
   TESTNAME: sqlalchemy
   TESTDIST: debian12
+  SHA: ${{ github.sha }}
 
 jobs:
   test:
@@ -67,7 +68,7 @@ jobs:
         ./setup.sh test_sqlalchemy/sqlalchemy
 
         # use cached build
-        rm -rf ./proxysql  && mv ../proxysql .
+        rm -rf ./proxysql && mv ../proxysql .
                 
     - name: Run tests
       run: |
@@ -114,7 +115,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ github.sha }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-${{ matrix.infradb }}-${{ matrix.connector }}-logs-run#${{ github.run_number }}
         path: |
           proxysql_3p_testing/test_sqlalchemy/logs
           
diff --git a/.github/workflows/ci-basictests.yml b/.github/workflows/ci-basictests.yml
index 7c07770a3..ef0eb39e2 100644
--- a/.github/workflows/ci-basictests.yml
+++ b/.github/workflows/ci-basictests.yml
@@ -7,6 +7,9 @@ on:
       trigger:
         type: string
 
+env:
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+
 jobs:
 
   tests:
@@ -20,8 +23,8 @@ jobs:
     env:
       TESTDIST: ${{ matrix.testdist }}
       INFRADB:  ${{ matrix.infradb }}
-#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_src
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_src
+#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}_src
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}_src
 
     steps:
     
@@ -103,7 +106,7 @@ jobs:
         echo "export TEST_PY_TAP=0" >> test/env.sh
         echo "export TEST_PY_TAPINT=0" >> test/env.sh
         echo "export TEST_PY_FAILOVER=1" >> test/env.sh
-        #echo 'export TEST_PY_TAP_INCL="${{ matrix.testgroup }}"' >> test/env.sh
+        #echo 'export TEST_PY_TAP_INCL=""' >> test/env.sh
         #echo 'export TEST_PY_TAP_EXCL=""' >> test/env.sh
         echo 'export MALLOC_CONF="retain:false"' >> test/env.sh
         echo 'export WITHGCOV=0' >> test/env.sh
@@ -175,13 +178,12 @@ jobs:
         ./docker-compose-destroy.bash
         
         sudo chmod -R 777 ${{ github.workspace }}/*
-        echo "${{ matrix.testgroup }}" | tr -d '*|' | xargs -0 printf 'TESTGROUP=%s' >> $GITHUB_ENV
 
     - name: Archive artifacts logs
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-logs-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-logs-run#${{ github.run_number }}
         path: |
           proxysql/ci_*_logs/
           
@@ -189,7 +191,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-bin-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-bin-run#${{ github.run_number }}
         path: |
           proxysql/binaries/
           proxysql/src/
diff --git a/.github/workflows/ci-builds.yml b/.github/workflows/ci-builds.yml
index 69d76190c..401eada84 100644
--- a/.github/workflows/ci-builds.yml
+++ b/.github/workflows/ci-builds.yml
@@ -10,7 +10,8 @@ on:
 permissions: write-all
 
 env:
-  LOCK: CI_BUILDS_${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}
+  LOCK: CI_BUILDS_${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
 
 jobs:
 
@@ -74,8 +75,8 @@ jobs:
 #          - dist: 'ubuntu22'
 #            type: '-clang-tap-asan'
     env:
-#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.dist }}${{ matrix.type }}
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.dist }}${{ matrix.type }}
+#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.dist }}${{ matrix.type }}
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.dist }}${{ matrix.type }}
 
     steps:
 
@@ -92,8 +93,8 @@ jobs:
       if: ${{ steps.cache-check.outputs.cache-hit != 'true' }}
       uses: actions/checkout@v4
       with:
-#        repository: '${{ github.repository }}'
-#        ref: 'v2.x'
+        repository: ${{ github.repository }}
+        ref: ${{ env.SHA }}
         fetch-depth: 0
         path: 'proxysql'
 
@@ -128,7 +129,7 @@ jobs:
           #make ${{ matrix.dist }} | tee ci_build_log/build-deps.log
           # build tap tests
           sed -i "s/^build_tap_test_debug: build_src_debug$/build_tap_test_debug: build_src_debug_clickhouse/" Makefile
-          sed -i "/command/c \    command: bash -l -c 'cd /opt/proxysql && ${ASAN} make -j$(nproc) build_tap_test_debug'" docker-compose.yml
+          sed -i "/command/c \    command: bash -l -c 'cd /opt/proxysql && make -j$(nproc) build_tap_test_debug'" docker-compose.yml
           make ${{ matrix.dist }}-dbg | tee ci_build_log/build-tap.log
           
           # create matrix of all test folders containing *-t
@@ -204,7 +205,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ci-builds-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-run#${{ github.run_number }}-${{ matrix.dist }}${{ matrix.type }}
+        name: ci-builds-${{ env.SHA }}-run#${{ github.run_number }}-${{ matrix.dist }}${{ matrix.type }}
         path: |
           proxysql/
 
diff --git a/.github/workflows/ci-codeql.yml b/.github/workflows/ci-codeql.yml
index a5a8bb4f4..d66eb53e0 100644
--- a/.github/workflows/ci-codeql.yml
+++ b/.github/workflows/ci-codeql.yml
@@ -7,6 +7,9 @@ on:
       trigger:
         type: string
 
+env:
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+
 jobs:
   analyze:
     name: Analyze
@@ -25,8 +28,8 @@ jobs:
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
     env:
       TESTDIST: ${{ matrix.testdist }}
-#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_src
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_src
+#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}_src
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}_src
 
     steps:
     - name: Update
@@ -41,6 +44,8 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
       with:
+        repository: ${{ github.repository }}
+        ref: ${{ env.SHA }}
         fetch-depth: 0
         path: 'proxysql'
 
diff --git a/.github/workflows/ci-maketest.yml b/.github/workflows/ci-maketest.yml
index 9ab302389..273d41c6b 100644
--- a/.github/workflows/ci-maketest.yml
+++ b/.github/workflows/ci-maketest.yml
@@ -9,6 +9,9 @@ on:
       target:
         type: string
 
+env:
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+
 jobs:
   builds:
     runs-on: ubuntu-22.04
@@ -23,8 +26,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: ${{ github.repository }}
-#        ref: 'v2.x'
-        ref: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}
+        ref: ${{ env.SHA }}
         fetch-depth: 0
         path: 'proxysql'
         
@@ -53,7 +55,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-logs-run#${{ github.run_number }}-${{ matrix.target }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-logs-run#${{ github.run_number }}-${{ matrix.target }}
         path: |
           ./build-*.log
           
diff --git a/.github/workflows/ci-package-build.yml b/.github/workflows/ci-package-build.yml
index d394be2bf..525f28c72 100644
--- a/.github/workflows/ci-package-build.yml
+++ b/.github/workflows/ci-package-build.yml
@@ -7,6 +7,10 @@ on:
       trigger:
         type: string
 
+env:
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+  BIN_PKG:
+
 jobs:
   clean:
     runs-on: ubuntu-22.04
@@ -15,12 +19,12 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        # gh release delete-asset ${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}-head
-        gh release delete ${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}-head --repo ${{ github.repository }} --cleanup-tag || true
-        gh release create ${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}-head --repo ${{ github.repository }} --title ${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}-head --draft --prerelease --notes-file - << EOF
+        # gh release delete-asset ${SHA}-head
+        gh release delete ${SHA}-head --repo ${{ github.repository }} --cleanup-tag || true
+        gh release create ${SHA}-head --repo ${{ github.repository }} --title ${SHA}-head --draft --prerelease --notes-file - << EOF
         ## Development Snapshot
         
-        GH-Action Package-Build on PR merge into ${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}
+        GH-Action Package-Build on PR merge into ${SHA}
         
         Version : **${GIT_VERSION}**
         
@@ -31,16 +35,7 @@ jobs:
         [![CI-Package-Build](https://github.com/${{ github.repository }}/actions/workflows/CI-package-build.yml/badge.svg)](https://github.com/${{ github.repository }}/actions/workflows/CI-package-build.yml)
         
         EOF
-
-#    - name: Clean repo
-#      uses: appleboy/ssh-action@v0.1.8
-#      with:
-#        host: ${{ secrets.REPO_HOST }}
-#        username: ${{ secrets.REPO_USER }}
-#        key: ${{ secrets.REPO_PRIVATE_KEY }}
-#        script: |
-#          ls -1 ${{ secrets.REPO_TARGET }} | sort -rV | tail +6 | xargs -n1 rm -rf
-    
+   
   build:
     runs-on: ubuntu-22.04
     needs: [ clean ]
@@ -65,8 +60,8 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
       with:
-        repository: 'sysown/proxysql'
-#        ref: 'v2.x'
+        repository: ${{ github.repository }}
+        ref: ${{ env.SHA }}
         fetch-depth: 0
       
     - name: Set GIT_VERSION
@@ -79,11 +74,11 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        if [[ "${{ matrix.dist }}" = "centos7" ]] && [[ "${{ matrix.type }}" = "" ]]; then
-        gh release edit ${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}-head --draft --prerelease --repo ${{ github.repository }} --tag ${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}-head --title "${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}-head - ${GIT_VERSION}" --notes-file - << EOF
+        if [[ "${{ matrix.dist }}" = "centos9" ]] && [[ "${{ matrix.type }}" = "" ]]; then
+        gh release edit ${SHA}-head --draft --prerelease --repo ${{ github.repository }} --tag ${SHA}-head --title "${SHA}-head - ${GIT_VERSION}" --notes-file - << EOF
         ## Development Snapshot
         
-        GH-Action Package-Build on PR merge into ${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}
+        GH-Action Package-Build on PR merge into ${SHA}
         
         Version : **${GIT_VERSION}**
         
@@ -101,36 +96,16 @@ jobs:
         make ${{ matrix.dist }}${{ matrix.type }}
         echo "BIN_PKG=$(ls -1 binaries/*[mb])" >> $GITHUB_ENV
         echo "BIN_HASH=$(ls -1 binaries/*.id-hash)" >> $GITHUB_ENV
-    
-#    - name: Deploy to Repo
-#      uses: easingthemes/ssh-deploy@main
-#      env:
-#          SSH_PRIVATE_KEY: ${{ secrets.REPO_PRIVATE_KEY }}
-#          ARGS: "-aic"
-#          SOURCE: ${{ env.BIN_PKG }}
-#          REMOTE_HOST: ${{ secrets.REPO_HOST }}
-#          REMOTE_USER: ${{ secrets.REPO_USER }}
-#          TARGET: ${{ secrets.REPO_TARGET }}/binaries-${{ env.GIT_VERSION }}/
-#          EXCLUDE: binaries/.gitignore
-    
+
     - name: Push packages
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        # git tag --force -a ${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}-head -m 'GH-Actions - Development Snapshot Build'
+        # git tag --force -a ${SHA}-head -m 'GH-Actions - Development Snapshot Build'
         # git push origin --tags
-        # gh release upload ${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}-head --repo ${{ github.repository }} --clobber binaries/proxysql*${{ matrix.dist }}*[mb]
-        gh release upload ${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}-head --repo ${{ github.repository }} --clobber ${{ env.BIN_PKG }}
-    
-#    - name: Archive artifacts
-#      if: ${{ failure() && !cancelled() }}
-#      uses: actions/upload-artifact@v4
-#      with:
-#        name: ${{ github.workflow }}-${{ env.GIT_VERSION }}-${{ matrix.dist }}
-#        path: |
-#          ./binaries/
-#          !./**/.gitignore
-    
+        # gh release upload ${SHA}-head --repo ${{ github.repository }} --clobber binaries/proxysql*${{ matrix.dist }}*[mb]
+        gh release upload ${SHA}-head --repo ${{ github.repository }} --clobber ${{ env.BIN_PKG }}
+ 
   finalize:
     runs-on: ubuntu-22.04
     needs: [ build ]
@@ -139,11 +114,11 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        GIT_VERSION=$(gh release --repo ${{ github.repository }} view ${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}-head | tr -d '*' | grep -Po "(?<=Version : ).*")
-        gh release edit ${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}-head --draft --prerelease --repo ${{ github.repository }} --tag ${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}-head --notes-file - << EOF
+        GIT_VERSION=$(gh release --repo ${{ github.repository }} view ${SHA}-head | tr -d '*' | grep -Po "(?<=Version : ).*")
+        gh release edit ${SHA}-head --draft --prerelease --repo ${{ github.repository }} --tag ${SHA}-head --notes-file - << EOF
         ## Development Snapshot
         
-        GH-Action Package-Build on PR merge into ${{ fromJson(inputs.trigger).event.workflow_run.head_branch }}
+        GH-Action Package-Build on PR merge into ${SHA}
         
         Version : **${GIT_VERSION}**
         
diff --git a/.github/workflows/ci-repltests.yml b/.github/workflows/ci-repltests.yml
index 2c51c4997..84ff88807 100644
--- a/.github/workflows/ci-repltests.yml
+++ b/.github/workflows/ci-repltests.yml
@@ -7,6 +7,9 @@ on:
       trigger:
         type: string
 
+env:
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+
 jobs:
   tests:
     runs-on: ubuntu-22.04
@@ -19,8 +22,7 @@ jobs:
     env:
       TESTDIST: ${{ matrix.testdist }}
       INFRADB:  ${{ matrix.infradb }}
-#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_src
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_src
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}_src
 
     steps:
     
@@ -95,7 +97,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-logs-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-logs-run#${{ github.run_number }}
         path: |
           proxysql/ci_*_logs/
           
@@ -103,7 +105,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-bin-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-bin-run#${{ github.run_number }}
         path: |
           proxysql/binaries/
           proxysql/src/
diff --git a/.github/workflows/ci-selftests.yml b/.github/workflows/ci-selftests.yml
index 39f6d25d7..fa24c1d50 100644
--- a/.github/workflows/ci-selftests.yml
+++ b/.github/workflows/ci-selftests.yml
@@ -7,6 +7,9 @@ on:
       trigger:
         type: string
 
+env:
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+
 jobs:
   tests:
     runs-on: ubuntu-22.04
@@ -19,8 +22,7 @@ jobs:
     env:
       TESTDIST: ${{ matrix.testdist }}
       INFRADB:  ${{ matrix.infradb }}
-#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_src
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_src
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}_src
 
     steps:
 
@@ -124,7 +126,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-logs-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-logs-run#${{ github.run_number }}
         path: |
           proxysql/ci_*_logs/
           
@@ -132,7 +134,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-bin-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-bin-run#${{ github.run_number }}
         path: |
           proxysql/binaries/
           proxysql/src/
diff --git a/.github/workflows/ci-shuntest.yml b/.github/workflows/ci-shuntest.yml
index ae81d66da..c863f9090 100644
--- a/.github/workflows/ci-shuntest.yml
+++ b/.github/workflows/ci-shuntest.yml
@@ -7,6 +7,9 @@ on:
       trigger:
         type: string
 
+env:
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+
 jobs:
   tests:
     runs-on: ubuntu-22.04
@@ -19,8 +22,7 @@ jobs:
     env:
       TESTDIST: ${{ matrix.testdist }}
       INFRADB:  ${{ matrix.infradb }}
-#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_src
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_src
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}_src
 
     steps:
 
@@ -89,7 +91,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-logs-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-logs-run#${{ github.run_number }}
         path: |
           proxysql/ci_*_logs/
           
@@ -97,7 +99,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-bin-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-bin-run#${{ github.run_number }}
         path: |
           proxysql/binaries/
           proxysql/src/
diff --git a/.github/workflows/ci-taptests-asan.yml b/.github/workflows/ci-taptests-asan.yml
index 465a7b9d5..dbb9c5d5f 100644
--- a/.github/workflows/ci-taptests-asan.yml
+++ b/.github/workflows/ci-taptests-asan.yml
@@ -9,6 +9,7 @@ on:
 
 env:
   TAPGROUP: tests_group_asan
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
 
 jobs:
   select:
@@ -24,8 +25,8 @@ jobs:
     env:
       TESTDIST: ${{ matrix.testdist }}
       INFRADB:  ${{ matrix.infradb }}
-#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_matrix
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_matrix
+#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}_matrix
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}_matrix
 
     steps:
 
@@ -92,9 +93,9 @@ jobs:
         testgroup: ${{ fromJson(needs.select.outputs.matrix) }}
     env:
       TESTDIST: ${{ matrix.testdist }}
+      TESTGROUP: ${{ matrix.testgroup }}
       INFRADB:  ${{ matrix.infradb }}
-#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}
 
     steps:
 
@@ -305,7 +306,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-logs-run#${{ github.run_number }}-${{ env.TESTGROUP }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-logs-run#${{ github.run_number }}-${{ env.TESTGROUP }}
         path: |
           proxysql/ci_*_logs/
 
@@ -313,7 +314,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-bins-run#${{ github.run_number }}-${{ env.TESTGROUP }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-bins-run#${{ github.run_number }}-${{ env.TESTGROUP }}
         path: |
           proxysql/binaries/
           proxysql/src/
@@ -324,7 +325,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-tests-run#${{ github.run_number }}-${{ env.TESTGROUP }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-tests-run#${{ github.run_number }}-${{ env.TESTGROUP }}
         path: |
           proxysql/test/tap/tests*
           
diff --git a/.github/workflows/ci-taptests-groups.yml b/.github/workflows/ci-taptests-groups.yml
index 5963f7ca5..4c6541afd 100644
--- a/.github/workflows/ci-taptests-groups.yml
+++ b/.github/workflows/ci-taptests-groups.yml
@@ -9,6 +9,9 @@ on:
       testgroup:
         type: string
 
+env:
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+
 jobs:
   select:
     runs-on: ubuntu-22.04
@@ -23,8 +26,8 @@ jobs:
     env:
       TESTDIST: ${{ matrix.testdist }}
       INFRADB:  ${{ matrix.infradb }}
-#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_matrix
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_matrix
+#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}_matrix
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}_matrix
 
     steps:
 
@@ -94,8 +97,8 @@ jobs:
     env:
       TESTDIST: ${{ matrix.testdist }}
       INFRADB:  ${{ matrix.infradb }}
-#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}
+      TESTGROUP: ${{ matrix.testgroup }}
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}
 
     steps:
 
@@ -312,7 +315,7 @@ jobs:
       if: ${{ failure() || cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-logs-run#${{ github.run_number }}-${{ env.TESTGROUP }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-logs-run#${{ github.run_number }}-${{ env.TESTGROUP }}
         path: |
           proxysql/ci_*_logs/
 
@@ -321,7 +324,7 @@ jobs:
       if: ${{ failure() || cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-bins-run#${{ github.run_number }}-${{ env.TESTGROUP }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-bins-run#${{ github.run_number }}-${{ env.TESTGROUP }}
         path: |
           proxysql/binaries/
           proxysql/src/
@@ -333,6 +336,6 @@ jobs:
       if: ${{ failure() || cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-tests-run#${{ github.run_number }}-${{ env.TESTGROUP }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-tests-run#${{ github.run_number }}-${{ env.TESTGROUP }}
         path: |
           proxysql/test/tap/tests*
diff --git a/.github/workflows/ci-taptests-old.yml b/.github/workflows/ci-taptests-old.yml
index 11217d647..fd7943e72 100644
--- a/.github/workflows/ci-taptests-old.yml
+++ b/.github/workflows/ci-taptests-old.yml
@@ -8,6 +8,9 @@ on:
       trigger:
         type: string
 
+env:
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
+
 jobs:
   build:
     runs-on: ubuntu-22.04
@@ -43,7 +46,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: 'sysown/proxysql'
-#        ref: 'v2.x'
+        ref: ${{ env.SHA }}
         fetch-depth: 0
         path: 'proxysql'
 
@@ -137,7 +140,7 @@ jobs:
       if: ${{ always() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-run#${{ github.run_number }}
         path: |
           proxysql/src/
           proxysql/test/
@@ -158,6 +161,10 @@ jobs:
 #        testgroup: [ '' ]
 #        testgroup: [ 'kill_connection3-t', 'reg_test_3847_admin_lock-t', 'set_testing-240-t', 'max_connections_ff-t', 'test_server_sess_status-t' ]
         testgroup: ${{ fromJson(needs.build.outputs.matrix) }}
+    env:
+      TESTGROUP: ${{ matrix.testgroup }}
+      GIT_VERSION:
+
     steps:
     
     - name: Install dependencies
@@ -185,8 +192,8 @@ jobs:
     - name: Checkout proxysql
       uses: actions/checkout@v4
       with:
-        repository: 'sysown/proxysql'
-#        ref: 'v2.x'
+        repository: ${{ github.repository }}
+        ref: ${{ env.SHA }}
         fetch-depth: 0
         path: 'proxysql'
         
@@ -199,7 +206,7 @@ jobs:
     - name: Download build
       uses: actions/download-artifact@v4
       with:
-        name: ${{ env.GITHUB_WORKFLOW }}-${{ env.GIT_VERSION }}-run#${{ github.run_number }}
+        name: ${{ github.workflow }}-${{ env.GIT_VERSION }}-run#${{ github.run_number }}
         path: proxysql
         
     - name: Fix build
@@ -304,7 +311,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-logs-run#${{ github.run_number }}-${{ env.TESTGROUP }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-logs-run#${{ github.run_number }}-${{ env.TESTGROUP }}
         path: |
           proxysql/ci_*_logs/
 
@@ -312,7 +319,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-bins-run#${{ github.run_number }}-${{ env.TESTGROUP }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-bins-run#${{ github.run_number }}-${{ env.TESTGROUP }}
         path: |
           proxysql/binaries/
           proxysql/src/
@@ -323,7 +330,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-tests-run#${{ github.run_number }}-${{ env.TESTGROUP }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-tests-run#${{ github.run_number }}-${{ env.TESTGROUP }}
         path: |
           proxysql/test/tap/tests*
           
diff --git a/.github/workflows/ci-taptests-ssl.yml b/.github/workflows/ci-taptests-ssl.yml
index 535cad641..8bcf65a3e 100644
--- a/.github/workflows/ci-taptests-ssl.yml
+++ b/.github/workflows/ci-taptests-ssl.yml
@@ -9,6 +9,7 @@ on:
 
 env:
   TAPGROUP: tests_group_ssl-matrix
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
 
 jobs:
   select:
@@ -24,8 +25,8 @@ jobs:
     env:
       TESTDIST: ${{ matrix.testdist }}
       INFRADB:  ${{ matrix.infradb }}
-#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_matrix
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_matrix
+#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}_matrix
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}_matrix
 
     steps:
 
@@ -78,9 +79,9 @@ jobs:
 #        taptests: ${{ fromJson(needs.select.outputs.matrix) }}
     env:
       TESTDIST: ${{ matrix.testdist }}
+      TAPTESTS: ${{ matrix.taptests }}
       INFRADB:  ${{ matrix.infradb }}
-#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}
 
     steps:
 
@@ -321,7 +322,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-logs-run#${{ github.run_number }}-${{ env.TAPTESTS }}-${{ matrix.usessl }}-${{ matrix.compress }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-logs-run#${{ github.run_number }}-${{ env.TAPTESTS }}-${{ matrix.usessl }}-${{ matrix.compress }}
         path: |
           proxysql/ci_*_logs/
 
@@ -329,7 +330,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-bins-run#${{ github.run_number }}-${{ env.TAPTESTS }}-${{ matrix.usessl }}-${{ matrix.compress }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-bins-run#${{ github.run_number }}-${{ env.TAPTESTS }}-${{ matrix.usessl }}-${{ matrix.compress }}
         path: |
           proxysql/binaries/
           proxysql/src/
@@ -340,7 +341,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-tests-run#${{ github.run_number }}-${{ env.TAPTESTS }}-${{ matrix.usessl }}-${{ matrix.compress }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-tests-run#${{ github.run_number }}-${{ env.TAPTESTS }}-${{ matrix.usessl }}-${{ matrix.compress }}
         path: |
           proxysql/test/tap/tests*
           
diff --git a/.github/workflows/ci-taptests.yml b/.github/workflows/ci-taptests.yml
index 17f5ad351..e8238560c 100644
--- a/.github/workflows/ci-taptests.yml
+++ b/.github/workflows/ci-taptests.yml
@@ -11,6 +11,7 @@ on:
 
 env:
   TAPGROUP: tests
+  SHA: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}
 
 jobs:
   select:
@@ -26,8 +27,8 @@ jobs:
     env:
       TESTDIST: ${{ matrix.testdist }}
       INFRADB:  ${{ matrix.infradb }}
-#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_matrix
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}_matrix
+#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}_matrix
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}_matrix
 
     steps:
 
@@ -96,9 +97,9 @@ jobs:
         taptests: ${{ fromJson(needs.select.outputs.matrix) }}
     env:
       TESTDIST: ${{ matrix.testdist }}
+      TAPTESTS: ${{ matrix.taptests }}
       INFRADB:  ${{ matrix.infradb }}
-#      BLDCACHE: CI-builds_${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}
-      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}_${{ matrix.testdist }}
+      BLDCACHE: ${{ fromJson(inputs.trigger).event.workflow_run.head_sha || github.sha }}_${{ matrix.testdist }}
 
     steps:
 
@@ -258,7 +259,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-logs-run#${{ github.run_number }}-${{ env.TAPTESTS }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-logs-run#${{ github.run_number }}-${{ env.TAPTESTS }}
         path: |
           proxysql/ci_*_logs/
 
@@ -266,7 +267,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-bins-run#${{ github.run_number }}-${{ env.TAPTESTS }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-bins-run#${{ github.run_number }}-${{ env.TAPTESTS }}
         path: |
           proxysql/binaries/
           proxysql/src/
@@ -277,7 +278,7 @@ jobs:
       if: ${{ failure() && !cancelled() }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ github.workflow }}-${{ fromJson(inputs.trigger).event.workflow_run.head_sha }}-tests-run#${{ github.run_number }}-${{ env.TAPTESTS }}
+        name: ${{ github.workflow }}-${{ env.SHA }}-tests-run#${{ github.run_number }}-${{ env.TAPTESTS }}
         path: |
           proxysql/test/tap/tests*