diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 841ec4caab5..659f9025fbb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -219,6 +219,8 @@ upload_rpm:
     - sign_rpm
   rules:
     - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH
+      when: manual
   script:
     - RPM_NAME=`ls packages/fhs/target/rpmbuild/RPMS/noarch/ | grep dcache`
     - VERSION=`echo $RPM_NAME | cut -d'-' -f 2 | cut -d'.' -f 1,2`
@@ -231,6 +233,8 @@ upload_srm_client_rpm:
     - sign_srm_client_rpm
   rules:
     - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH
+      when: manual
   script:
     - RPM_NAME=`ls modules/srm-client/target/rpmbuild/RPMS/noarch/ | grep dcache-srmclient`
     - VERSION=`echo $RPM_NAME | cut -d'-' -f 3 | cut -d'.' -f 1,2`
@@ -243,6 +247,8 @@ upload_deb:
     - sign_deb
   rules:
     - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH
+      when: manual
   script:
     - DEB_NAME=`ls packages/fhs/target/ | grep dcache`
     - VERSION=`echo $DEB_NAME | cut -d'_' -f 2 | cut -d'.' -f 1,2`
@@ -255,6 +261,8 @@ upload_tar:
     - tar
   rules:
     - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH
+      when: manual
   script:
     - TAR_NAME=`ls packages/tar/target/ | grep dcache`
     - VERSION=`echo $TAR_NAME | cut -d'-' -f 2 | cut -d'.' -f 1,2`
@@ -269,7 +277,10 @@ upload_container:
   # Only debug/*-debug versions of the Kaniko image are known to work within Gitlab CI
   image: gcr.io/kaniko-project/executor:debug
   needs: ["tar"]
-  when: manual
+  rules:
+    - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH
+      when: manual
   script:
     - |-
       tag=$CI_COMMIT_SHORT_SHA