diff --git a/.github/workflows/ci-3p-django-framework.yml b/.github/workflows/ci-3p-django-framework.yml
index 75dd77d01..b5e6bda4d 100644
--- a/.github/workflows/ci-3p-django-framework.yml
+++ b/.github/workflows/ci-3p-django-framework.yml
@@ -98,6 +98,9 @@ jobs:
         cd proxysql_3p_testing/
         ./setup.sh test_django-framework
         git switch ${{ env.TESTTREE }}
+        git config user.email "GH-Actions@proxysql.com"
+        git config user.name "GH-Actions"
+        git rebase main -f -s recursive -X theirs
         
         # use cached build
         rm -rf ./proxysql && mv ../proxysql . || true
diff --git a/.github/workflows/ci-3p-mariadb-connector-c.yml b/.github/workflows/ci-3p-mariadb-connector-c.yml
index 177aa3bfe..7bd8149fb 100644
--- a/.github/workflows/ci-3p-mariadb-connector-c.yml
+++ b/.github/workflows/ci-3p-mariadb-connector-c.yml
@@ -99,8 +99,9 @@ jobs:
         git sparse-checkout list
         ./setup.sh test_mariadb-connector-c/mariadb-connector-c
         git switch ${{ env.TESTTREE }}
-        #git -C ./proxysql switch ${{ env.SHA }}
-        #git -C ./proxysql pull --tags
+        git config user.email "GH-Actions@proxysql.com"
+        git config user.name "GH-Actions"
+        git rebase main -f -s recursive -X theirs
         
         # use cached build
         rm -rf ./proxysql && mv ../proxysql . || true
diff --git a/.github/workflows/ci-3p-mysql-connector-j.yml b/.github/workflows/ci-3p-mysql-connector-j.yml
index 40014a217..594fbdee2 100644
--- a/.github/workflows/ci-3p-mysql-connector-j.yml
+++ b/.github/workflows/ci-3p-mysql-connector-j.yml
@@ -98,6 +98,9 @@ jobs:
         cd proxysql_3p_testing/
         ./setup.sh test_mysql-connector-j/mysql-connector-j
         git switch ${{ env.TESTTREE }}
+        git config user.email "GH-Actions@proxysql.com"
+        git config user.name "GH-Actions"
+        git rebase main -f -s recursive -X theirs
         
         # use cached build
         rm -rf ./proxysql && mv ../proxysql . || true
diff --git a/.github/workflows/ci-3p-php-pdo-mysql.yml b/.github/workflows/ci-3p-php-pdo-mysql.yml
index 7f690a9c7..e3e91339b 100644
--- a/.github/workflows/ci-3p-php-pdo-mysql.yml
+++ b/.github/workflows/ci-3p-php-pdo-mysql.yml
@@ -98,6 +98,9 @@ jobs:
         cd proxysql_3p_testing/
         ./setup.sh test_php-pdo-mysql/php-src
         git switch ${{ env.TESTTREE }}
+        git config user.email "GH-Actions@proxysql.com"
+        git config user.name "GH-Actions"
+        git rebase main -f -s recursive -X theirs
 
         # use cached build
         rm -rf ./proxysql && mv ../proxysql . || true
diff --git a/.github/workflows/ci-3p-postgresql.yml b/.github/workflows/ci-3p-postgresql.yml
index 1722184cd..344775775 100644
--- a/.github/workflows/ci-3p-postgresql.yml
+++ b/.github/workflows/ci-3p-postgresql.yml
@@ -102,6 +102,9 @@ jobs:
         cd proxysql_3p_testing/
         ./setup.sh test_postgresql/postgresql
         git switch ${{ env.TESTTREE }}
+        git config user.email "GH-Actions@proxysql.com"
+        git config user.name "GH-Actions"
+        git rebase main -f -s recursive -X theirs
         
         # use cached build
         rm -rf ./proxysql && mv ../proxysql . || true
diff --git a/.github/workflows/ci-3p-sqlalchemy.yml b/.github/workflows/ci-3p-sqlalchemy.yml
index 1229fe1e6..2184ca313 100644
--- a/.github/workflows/ci-3p-sqlalchemy.yml
+++ b/.github/workflows/ci-3p-sqlalchemy.yml
@@ -101,6 +101,9 @@ jobs:
         cd proxysql_3p_testing/
         ./setup.sh test_sqlalchemy/sqlalchemy
         git switch ${{ env.TESTTREE }}
+        git config user.email "GH-Actions@proxysql.com"
+        git config user.name "GH-Actions"
+        git rebase main -f -s recursive -X theirs
 
         # use cached build
         rm -rf ./proxysql && mv ../proxysql . || true