diff --git a/.github/workflows/backend-tests.yml b/.github/no_workflow/backend-tests.yml
similarity index 100%
rename from .github/workflows/backend-tests.yml
rename to .github/no_workflow/backend-tests.yml
diff --git a/.github/workflows/build-and-deploy-docs.yml b/.github/no_workflow/build-and-deploy-docs.yml
similarity index 100%
rename from .github/workflows/build-and-deploy-docs.yml
rename to .github/no_workflow/build-and-deploy-docs.yml
diff --git a/.github/workflows/codeql-analysis.yml b/.github/no_workflow/codeql-analysis.yml
similarity index 100%
rename from .github/workflows/codeql-analysis.yml
rename to .github/no_workflow/codeql-analysis.yml
diff --git a/.github/workflows/dependency-review.yml b/.github/no_workflow/dependency-review.yml
similarity index 100%
rename from .github/workflows/dependency-review.yml
rename to .github/no_workflow/dependency-review.yml
diff --git a/.github/workflows/docker.yml b/.github/no_workflow/docker.yml
similarity index 100%
rename from .github/workflows/docker.yml
rename to .github/no_workflow/docker.yml
diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/no_workflow/frontend-admin-tests.yml
similarity index 100%
rename from .github/workflows/frontend-admin-tests.yml
rename to .github/no_workflow/frontend-admin-tests.yml
diff --git a/.github/workflows/frontend-tests.yml b/.github/no_workflow/frontend-tests.yml
similarity index 100%
rename from .github/workflows/frontend-tests.yml
rename to .github/no_workflow/frontend-tests.yml
diff --git a/.github/workflows/load-test.yml b/.github/no_workflow/load-test.yml
similarity index 100%
rename from .github/workflows/load-test.yml
rename to .github/no_workflow/load-test.yml
diff --git a/.github/workflows/perform-type-check.yml b/.github/no_workflow/perform-type-check.yml
similarity index 100%
rename from .github/workflows/perform-type-check.yml
rename to .github/no_workflow/perform-type-check.yml
diff --git a/.github/workflows/rate-limit.yml b/.github/no_workflow/rate-limit.yml
similarity index 100%
rename from .github/workflows/rate-limit.yml
rename to .github/no_workflow/rate-limit.yml
diff --git a/.github/workflows/upgrade-from-latest-release.yml b/.github/no_workflow/upgrade-from-latest-release.yml
similarity index 100%
rename from .github/workflows/upgrade-from-latest-release.yml
rename to .github/no_workflow/upgrade-from-latest-release.yml
diff --git a/.github/workflows/windows.yml b/.github/no_workflow/windows.yml
similarity index 100%
rename from .github/workflows/windows.yml
rename to .github/no_workflow/windows.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f7f5f3b2c..0a23150ab 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,12 +18,24 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        working-directory: etherpad
         with:
             repository: ether/etherpad-lite
             path: etherpad
             token: '${{ secrets.ETHER_RELEASE_TOKEN }}'
             fetch-depth: '0'
             fetch-tags: 'true'
+      - name: Checkout master
+        run: |
+          git fetch origin master
+          git checkout master
+          git reset --hard origin/master
+      - name: Checkout develop
+        working-directory: etherpad
+        run: |
+          git fetch origin develop
+          git checkout develop
+          git reset --hard origin/develop
       - name: Checkout repository
         uses: actions/checkout@v4
         with: