diff --git a/.github/workflows/ci-selftests.yml b/.github/workflows/ci-selftests.yml
index 5bf036495..0a6100700 100644
--- a/.github/workflows/ci-selftests.yml
+++ b/.github/workflows/ci-selftests.yml
@@ -17,34 +17,23 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     
     steps:
-    - name: Install build tools
-      run: sudo apt-get -y install make automake git wget gcc g++ libtool equivs python3 valgrind
-      
-    - name: Install build dependencies
-      run: sudo apt-get -y install libssl-dev gnutls-dev libgnutls28-dev libmysqlclient-dev libboost-all-dev libunwind8 libunwind-dev uuid-dev ca-certificates
-      
-    - name: Install test tools
-      run: sudo apt-get -y install mysql-client
-            
     - name: Checkout repository
       uses: actions/checkout@v3
-      
-    - name: Git describe
-      env:
-        GH_TOKEN: ${{ github.token }}
+      with:
+        repository: 'sysown/proxysql'
+#        ref: 'v2.x'
+        fetch-depth: 0
+
+    - name: Set GIT_VERSION
       run: |
-        export VERS=$(git ls-remote https://github.com/sysown/proxysql.git "refs/tags/*" | grep -v 'refs/tags/v' | sed -e 's|.*/||g' | tail -2 | head -1)
-        export HASH=$(gh api repos/sysown/proxysql/git/refs/heads/v2.x | jq '.object.sha' | cut -c2-8)
-        export CMTS=$(gh api repos/sysown/proxysql/compare/${VERS}...v2.x | jq '.ahead_by')
-        echo "git descibe : ${VERS}-${CMTS}-g${HASH}"
-        echo "GIT_VERSION=${VERS}-${CMTS}-g${HASH}" >> $GITHUB_ENV
-    
+        git fetch --tags --force
+        echo "GIT_VERSION=$(git describe --long --abbrev=7)" >> $GITHUB_ENV
     - name: Build
       run: |
-        make debug_clickhouse
+        make ubuntu22-dbg
         
     - name: Self-tests
       run: |
@@ -52,10 +41,8 @@ jobs:
         set +e
         set -o pipefail
         set -x
-
         cd src && (./proxysql -f --initial --clickhouse --idle-threads -D . &>proxysql.log &)
         sleep 30
-
         mysql -V -vvv
         mysql -uadmin -padmin -h127.0.0.1 -P6032 -vvv -e "SELECT version();" 2>&1 | grep -v 'Using a password'
         mysql -uadmin -padmin -h127.0.0.1 -P6032 -vvv -e "SET mysql-verbose_query_error=true;" 2>&1 | grep -v 'Using a password'
@@ -80,12 +67,11 @@ jobs:
         sleep 30
         echo 'DONE'
         exit $RC
-
     - name: Archive artifacts
       if: always()
       uses: actions/upload-artifact@v3
       with:
-        name: artifacts-${{ github.run_number }}
+        name: ci-selftests-${{ env.GIT_VERSION }}-run#${{ github.run_number }}
         path: |
           ./src/