diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fa322c5..e5c5aad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,11 +83,12 @@ jobs:
 
         git checkout master-ci
         git pull
-        git rebase origin/release
 
         git checkout release
         git merge --no-squash master-ci --strategy-option theirs
 
+        git rebase origin/release
+
         sed -i -e 's/DEBUG = True/DEBUG = False/g' brickbox/settings.py
 
         git add .