diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00c6e368ed3c0f13ece70c59fb0c8bbd55c6b7ee..3e6a265f1df2e148a157a62df3d63a9451c6debb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,24 +58,26 @@ publish-testing-repository:
     - |
         set -e
         echo "Uploading new files to temporary folder Testing-new..."
-        sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P $SFTP_PORT $SFTP_USER@$SFTP_SERVER << EOF
+        sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P $SFTP_PORT $SFTP_USER@$SFTP_SERVER << EOF || exit 1
           mkdir Testing-new
           put -r vnf-catalog/* Testing-new
         EOF
         
         echo "Switching directories..."
-        sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P $SFTP_PORT $SFTP_USER@$SFTP_SERVER << EOF
+        sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P $SFTP_PORT $SFTP_USER@$SFTP_SERVER << EOF || exit 1
           rename Testing Testing-old
           rename Testing-new Testing
         EOF
         
         echo "Cleaning up temporary folder Testing-new..."
-        sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P $SFTP_PORT $SFTP_USER@$SFTP_SERVER << EOF
+        sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P $SFTP_PORT $SFTP_USER@$SFTP_SERVER << EOF || exit 1
           rmdir Testing-new
         EOF
-  rules:
-    - if: '$CI_COMMIT_REF_NAME == "master"' # Only in master
-      when: on_success
+  when: manual  # This job is run on demand
+  allow_failure: true
+#  rules:
+#    - if: '$CI_COMMIT_REF_NAME == "master"' # Only in master
+#      when: on_success
     # - if: '$CI_COMMIT_REF_PROTECTED == "true"'
     #   when: on_success
 
@@ -96,13 +98,13 @@ publish-ondemand-repository:
         BACKUP_FOLDER="${DESTINATION_FOLDER}-old"
         
         echo "Uploading files to temporary folder $TEMP_FOLDER in FTP ..."
-        sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P $SFTP_PORT $SFTP_USER@$SFTP_SERVER << EOF
+        sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P $SFTP_PORT $SFTP_USER@$SFTP_SERVER << EOF || exit 1
           mkdir $TEMP_FOLDER
           put -r vnf-catalog/* $TEMP_FOLDER
         EOF
         
         echo "Switching directories..."
-        sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P $SFTP_PORT $SFTP_USER@$SFTP_SERVER << EOF
+        sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P $SFTP_PORT $SFTP_USER@$SFTP_SERVER << EOF || exit 1
           rename $DESTINATION_FOLDER $BACKUP_FOLDER
           rename $TEMP_FOLDER $DESTINATION_FOLDER
         EOF