diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c731a543..9743e3a08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -214,7 +214,7 @@ build-docker-master:
 
 build-docker-tag:
   <<: *docker
-  rules:
+  rules: &tag-rules
     - if: '$CI_PROJECT_NAMESPACE != "framasoft"'
       when: never
     - if: $CI_COMMIT_TAG
@@ -253,16 +253,7 @@ package-app-dev:
 release-upload:
   stage: upload
   image: framasoft/yakforms-assets-deploy:latest
-  rules:
-    - if: '$CI_PROJECT_NAMESPACE != "framasoft"'
-      when: never
-    - if: $CI_COMMIT_TAG
-  only:
-    variables:
-      - $CI_COMMIT_TAG
-      - $DEPLOYEMENT_KEY
-      - $DEPLOYEMENT_USER
-      - $DEPLOYEMENT_HOST
+  rules: *tag-rules
   script:
     - APP_VERSION="${CI_COMMIT_TAG}"
     - APP_ASSET="${CI_PROJECT_NAME}_${APP_VERSION}_${ARCH}.tar.gz"
@@ -283,10 +274,7 @@ release-upload:
 release-create:
   stage: deploy
   image: registry.gitlab.com/gitlab-org/release-cli:latest
-  rules:
-    - if: '$CI_PROJECT_NAMESPACE != "framasoft"'
-      when: never
-    - if: $CI_COMMIT_TAG
+  rules: *tag-rules
   before_script:
     - apk --no-cache add awk sed grep
   script: |