diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0962dc091b6a0019b14b17f7267bfe753b7338d2..1c94fa156776939994656906f55e076a4318298a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,8 @@ stages:
   - test_coverage
   - packaging
   - doc
+  - prepare_release
+  - publish_release_gitlab
   - publish_release
   - manual
 
diff --git a/.gitlab/ci/Makefile b/.gitlab/ci/Makefile
index 37817889659cf44c7d938657662bbcb39a474112..c8065f29dc3946a56c41f57d93b50de0426b90e2 100644
--- a/.gitlab/ci/Makefile
+++ b/.gitlab/ci/Makefile
@@ -159,7 +159,7 @@ gitlab-release:
 .PHONY: gitlab-take-ownership
 gitlab-take-ownership:
 	# Note: Only done in Gitlab CI context
-ifndef CI_PROJECT_DIR
+ifdef CI_PROJECT_DIR
 	# FIXME: https://gitlab.com/tezos/tezos/-/issues/2865
-	sudo chown -R $(id -u):$(id -g) ${CI_PROJECT_DIR}
+	sudo chown -R $(shell id -u):$(shell id -g) ${CI_PROJECT_DIR}
 endif
diff --git a/.gitlab/ci/publish_release.yml b/.gitlab/ci/publish_release.yml
index 9dbc779648b90e9236f9d8d9fb6471243532c38b..601912454025f6d92d54b909e42732191c9ebd45 100644
--- a/.gitlab/ci/publish_release.yml
+++ b/.gitlab/ci/publish_release.yml
@@ -4,7 +4,7 @@ gitlab:release:
     - .rules_template__release_tag
   # https://gitlab.com/tezos/docker-images/ci-release
   image: "${CI_REGISTRY}/tezos/docker-images/ci-release:v1.1.0"
-  stage: publish_release
+  stage: publish_release_gitlab
   # Publish jobs are uninterruptible to avoid publishing partial results.
   interruptible: false
   dependencies:
@@ -23,7 +23,7 @@ docker:merge_manifests:
     - .rules_template__master_and_releases
     - .image_template__docker
     - .docker_registry_auth # Sets up a before_script
-  stage: publish_release
+  stage: prepare_release
   script:
     - ./scripts/ci/docker_merge_manifests.sh