diff --git a/.github/workflows/CI-3p-django-framework.yml b/.github/workflows/CI-3p-django-framework.yml
index dc11bbdf6..9a4b2c0a1 100644
--- a/.github/workflows/CI-3p-django-framework.yml
+++ b/.github/workflows/CI-3p-django-framework.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
   
 concurrency:
@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
   
 jobs:
-  run:
+  run-mysql:
     if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
     uses: sysown/proxysql/.github/workflows/ci-3p-django-framework.yml@GH-Actions
     secrets: inherit
@@ -20,3 +20,21 @@ jobs:
       trigger: ${{ toJson(github) }}
       infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_mysql }}
       connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_mysql }}
+
+  run-mariadb:
+    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    uses: sysown/proxysql/.github/workflows/ci-3p-django-framework.yml@GH-Actions
+    secrets: inherit
+    with:
+      trigger: ${{ toJson(github) }}
+      infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_mariadb }}
+      connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_mariadb }}
+
+  run-pgsql:
+    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    uses: sysown/proxysql/.github/workflows/ci-3p-django-framework.yml@GH-Actions
+    secrets: inherit
+    with:
+      trigger: ${{ toJson(github) }}
+      infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_pgsql }}
+      connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_pgsql }}
diff --git a/.github/workflows/CI-3p-laravel-framework.yml b/.github/workflows/CI-3p-laravel-framework.yml
index 61a1fca70..0424349e9 100644
--- a/.github/workflows/CI-3p-laravel-framework.yml
+++ b/.github/workflows/CI-3p-laravel-framework.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
 
 concurrency:
@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  run:
+  run-mysql:
     if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
     uses: sysown/proxysql/.github/workflows/ci-3p-laravel-framework.yml@GH-Actions
     secrets: inherit
@@ -20,3 +20,19 @@ jobs:
       trigger: ${{ toJson(github) }}
       infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_mysql }}
       connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_mysql }}
+  run-mariadb:
+    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    uses: sysown/proxysql/.github/workflows/ci-3p-laravel-framework.yml@GH-Actions
+    secrets: inherit
+    with:
+      trigger: ${{ toJson(github) }}
+      infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_mariadb }}
+      connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_mariadb }}
+  run-pgsql:
+    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    uses: sysown/proxysql/.github/workflows/ci-3p-laravel-framework.yml@GH-Actions
+    secrets: inherit
+    with:
+      trigger: ${{ toJson(github) }}
+      infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_pgsql }}
+      connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_pgsql }}
diff --git a/.github/workflows/CI-3p-mariadb-connector-c.yml b/.github/workflows/CI-3p-mariadb-connector-c.yml
index 9da4830ee..b01523bef 100644
--- a/.github/workflows/CI-3p-mariadb-connector-c.yml
+++ b/.github/workflows/CI-3p-mariadb-connector-c.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
 
 concurrency:
diff --git a/.github/workflows/CI-3p-mysql-connector-j.yml b/.github/workflows/CI-3p-mysql-connector-j.yml
index 528432d83..663dd909d 100644
--- a/.github/workflows/CI-3p-mysql-connector-j.yml
+++ b/.github/workflows/CI-3p-mysql-connector-j.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
 
 concurrency:
diff --git a/.github/workflows/CI-3p-php-pdo-mysql.yml b/.github/workflows/CI-3p-php-pdo-mysql.yml
index b79efb8c8..2a3b9bea4 100644
--- a/.github/workflows/CI-3p-php-pdo-mysql.yml
+++ b/.github/workflows/CI-3p-php-pdo-mysql.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
 
 concurrency:
diff --git a/.github/workflows/CI-3p-sqlalchemy.yml b/.github/workflows/CI-3p-sqlalchemy.yml
index ed11fcb81..347338cb9 100644
--- a/.github/workflows/CI-3p-sqlalchemy.yml
+++ b/.github/workflows/CI-3p-sqlalchemy.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
 
 concurrency:
@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  run:
+  run-mysql:
     if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
     uses: sysown/proxysql/.github/workflows/ci-3p-sqlalchemy.yml@GH-Actions
     secrets: inherit
@@ -20,3 +20,21 @@ jobs:
       trigger: ${{ toJson(github) }}
       infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_mysql }}
       connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_mysql }}
+
+  run-mariadb:
+    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    uses: sysown/proxysql/.github/workflows/ci-3p-sqlalchemy.yml@GH-Actions
+    secrets: inherit
+    with:
+      trigger: ${{ toJson(github) }}
+      infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_mariadb }}
+      connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_mariadb }}
+
+  run-pgsql:
+    if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
+    uses: sysown/proxysql/.github/workflows/ci-3p-sqlalchemy.yml@GH-Actions
+    secrets: inherit
+    with:
+      trigger: ${{ toJson(github) }}
+      infradb: ${{ vars.MATRIX_3P_SQLALCHEMY_infradb_pgsql }}
+      connector: ${{ vars.MATRIX_3P_SQLALCHEMY_connector_pgsql }}
diff --git a/.github/workflows/CI-basictests.yml b/.github/workflows/CI-basictests.yml
index ce1f2577d..22f9f8431 100644
--- a/.github/workflows/CI-basictests.yml
+++ b/.github/workflows/CI-basictests.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
 
 concurrency:
diff --git a/.github/workflows/CI-builds.yml b/.github/workflows/CI-builds.yml
index e14f8b170..a26ba0c31 100644
--- a/.github/workflows/CI-builds.yml
+++ b/.github/workflows/CI-builds.yml
@@ -1,18 +1,14 @@
 name: CI-builds
-run-name: '${{ github.ref_name }} ${{ github.workflow }} ${{ github.sha }}'
+run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name }} ${{ github.workflow }} ${{ github.event.workflow_run && github.event.workflow_run.head_sha || github.sha }}'
 
 on:
-  push:
-#    branches: [ 'v[0-9]+.x','v[0-9]+.[0-9]+','v[0-9]+.[0-9]+.[0-9]+' ]
-    paths-ignore:
-    - '.github/**'
-    - '**.md'
-#  schedule:
-#    - cron: '15 13 * * 3'
   workflow_dispatch:
+  workflow_run:
+    workflows: [ CI-trigger ]
+    types: [ in_progress ]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}
+  group: ${{ github.workflow }}-${{ github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/CI-codeql.yml b/.github/workflows/CI-codeql.yml
index 7d5056881..7aa8ec268 100644
--- a/.github/workflows/CI-codeql.yml
+++ b/.github/workflows/CI-codeql.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
 
 concurrency:
diff --git a/.github/workflows/CI-maketest.yml b/.github/workflows/CI-maketest.yml
index 151be6db9..ce2cf6d48 100644
--- a/.github/workflows/CI-maketest.yml
+++ b/.github/workflows/CI-maketest.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
 
 concurrency:
diff --git a/.github/workflows/CI-repltests.yml b/.github/workflows/CI-repltests.yml
index 49e1577f6..f2beac23a 100644
--- a/.github/workflows/CI-repltests.yml
+++ b/.github/workflows/CI-repltests.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
 
 concurrency:
diff --git a/.github/workflows/CI-selftests.yml b/.github/workflows/CI-selftests.yml
index 3a0ea7fd7..7511805c3 100644
--- a/.github/workflows/CI-selftests.yml
+++ b/.github/workflows/CI-selftests.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
 
 concurrency:
diff --git a/.github/workflows/CI-shuntest.yml b/.github/workflows/CI-shuntest.yml
index 89c326f64..59b59b659 100644
--- a/.github/workflows/CI-shuntest.yml
+++ b/.github/workflows/CI-shuntest.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
 
 concurrency:
diff --git a/.github/workflows/CI-taptests-asan.yml b/.github/workflows/CI-taptests-asan.yml
index 49902d1bb..42ef9b6db 100644
--- a/.github/workflows/CI-taptests-asan.yml
+++ b/.github/workflows/CI-taptests-asan.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
 
 concurrency:
diff --git a/.github/workflows/CI-taptests-groups.yml b/.github/workflows/CI-taptests-groups.yml
index 1527d7d32..cb75b6a3a 100644
--- a/.github/workflows/CI-taptests-groups.yml
+++ b/.github/workflows/CI-taptests-groups.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
 
 concurrency:
diff --git a/.github/workflows/CI-taptests-ssl.yml b/.github/workflows/CI-taptests-ssl.yml
index be0efa365..e4f7a9257 100644
--- a/.github/workflows/CI-taptests-ssl.yml
+++ b/.github/workflows/CI-taptests-ssl.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
 
 concurrency:
diff --git a/.github/workflows/CI-taptests.yml b/.github/workflows/CI-taptests.yml
index 289d9790e..607f85711 100644
--- a/.github/workflows/CI-taptests.yml
+++ b/.github/workflows/CI-taptests.yml
@@ -4,7 +4,7 @@ run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branc
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: [ CI-builds ]
+    workflows: [ CI-trigger ]
     types: [ completed ]
 
 concurrency:
diff --git a/.github/workflows/CI-trigger.yml b/.github/workflows/CI-trigger.yml
new file mode 100644
index 000000000..c3ea21ac7
--- /dev/null
+++ b/.github/workflows/CI-trigger.yml
@@ -0,0 +1,18 @@
+name: CI-trigger
+run-name: '${{ github.ref_name }} ${{ github.workflow }} ${{ github.sha }}'
+
+on:
+  push:
+    paths-ignore:
+    - '.github/**'
+    - '**.md'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
+jobs:
+  run:
+    uses: sysown/proxysql/.github/workflows/ci-trigger.yml@GH-Actions
+    secrets: inherit