diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 6072982c89d7275efc2301128fc9057460fecaae..7e44d499a5dfde6b314b86906bf9248075aa14ab 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -40,10 +40,10 @@ industrial_ci_kinetic:
     ROS_DISTRO: kinetic
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
-      when: never
     - if: $CI_COMMIT_TAG
       when: never
+    - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
+      when: never
     - when: always
 
 industrial_ci_melodic:
@@ -52,9 +52,9 @@ industrial_ci_melodic:
     ROS_DISTRO: melodic
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
     - if: $CI_COMMIT_TAG
       when: never
+    - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
 
 industrial_ci_kinetic_deploy:
   extends: .industrial_ci
@@ -77,8 +77,8 @@ industrial_ci_kinetic_deploy:
     - docker build --build-arg APPLICATION_IMAGE=${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} -t ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev .
     - docker push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev
     - cd ..
-  only:
-    - tags
+  rules:
+    - if: $CI_COMMIT_TAG
 
 clang_format:
   stage: postcheck