diff --git a/.github/workflows/merge_3.3.x_to_master.yml b/.github/workflows/merge_3.3.x_to_master.yml
index 2863fa8c1e..4aec43cded 100644
--- a/.github/workflows/merge_3.3.x_to_master.yml
+++ b/.github/workflows/merge_3.3.x_to_master.yml
@@ -12,6 +12,9 @@ jobs:
         steps:
             - name: Checkout the repository
               uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0  # Fetch full history for proper merging
+                  ref: 3.3.x      # Checkout the 3.3.x branch
 
             - name: Fetch the latest commit information
               id: get-commit-info
@@ -35,9 +38,7 @@ jobs:
               run: git fetch --all
 
             - name: Merge 3.3.x into master
-              # First checkout 3.3.x and master to track from origin, then try merging to master
               run: |
-                  git checkout 3.3.x
                   git checkout master
                   if git merge --no-ff 3.3.x; then
                       echo "merge_failed=false" >> $GITHUB_ENV
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 893c4c4a28..32d8477671 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -351,7 +351,7 @@ jobs:
 
     # Other database types, namely sqlite3 and mssql
     other-tests:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-20.04
         strategy:
             matrix:
                 include: