diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa372c6540..5d383372c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,8 +46,9 @@ variables:
         export TARGET_REF="${CI_COMMIT_BEFORE_SHA}"
         export SOURCE_REF="${CI_COMMIT_SHA}"
     else
-        git fetch https://gitlab.com/fdroid/fdroiddata.git $CI_DEFAULT_BRANCH
-        export TARGET_REF="FETCH_HEAD"
+        git remote add upstream https://gitlab.com/fdroid/fdroiddata.git
+        git fetch upstream ${CI_DEFAULT_BRANCH}
+        export TARGET_REF=$(git merge-base --fork-point upstream/${CI_DEFAULT_BRANCH})
         export SOURCE_REF="${CI_COMMIT_SHA}"
     fi;