diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8d26a6d970e41b786738a0d94f9b9780524ba2d..ca6668978c4ce22fd2610623d573e654d5e8c37b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,15 +4,21 @@ include:
     file: "/.gitlab-ci.base.yml"
 
 stages:
-  - Unit Tests
-  - Docker Dokos
+  - Test
+  - Build
 
 variables:
   DOCLI_IMAGE: "registry.gitlab.com/dokos/docli:ci-develop"
 
-unittests:
+tests:
   image: $DOCLI_IMAGE
-  stage: Unit Tests
+  stage: Test
+
+  rules:
+    # Allow release pipelines to fail
+    - if: $CI_COMMIT_TAG != null
+      allow_failure: true
+    - when: always
 
   services:
     - name: mariadb:10.6
@@ -51,8 +57,8 @@ unittests:
   script:
     - bench --site test_site run-parallel-tests --app erpnext
 
-build_docker:
-  stage: Docker Dokos
+docker:
+  stage: Build
   rules:  # Run if the commit is tagged or if its message contains "[build-docker]"
     - if: $CI_COMMIT_TAG != null
     - if: $CI_COMMIT_MESSAGE =~ /\[build-docker\]/