diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml
index aa398204c07..8cf71a5f1aa 100644
--- a/.github/workflows/github_actions.yml
+++ b/.github/workflows/github_actions.yml
@@ -390,14 +390,14 @@ jobs:
               run: docker push quay.io/bywatersolutions/koha:${{ steps.extracted_variables.outputs.SHORTNAME }}-${{ steps.extracted_variables.outputs.KOHA_MAJOR_MINOR }}-latest
 
     set-default-branch:
-        if: github.repository == 'bywatersolutions/bywater-koha'
-        name: Change the default branch in GitHub
-        needs: [build-debs]
-        runs-on: ubuntu-latest
-        steps:
-            - run: gh api repos/bywatersolutions/bywater-koha --method PATCH --field 'default_branch=${{ github.ref_name }}'
-              env:
-                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      if: startsWith( github.ref, 'refs/heads/bywater-v' ) && github.repository == 'bywatersolutions/bywater-koha'
+      needs: [unit-test, is-a-mark]
+      runs-on: ubuntu-latest
+      steps:
+        - run: gh repo edit {bywatersolutions/bywater-koha --default-branch $BRANCH
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            BRANCH: ${GITHUB_REF##*/}
 
     zap-scan-baseline-opac:
         name: ZAP Scan - Baseline - OPAC