diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 1595d880cb85aa7e1a81b4d21fe33634d06b29fe..78fa4975997c2b1bdd4f5adae4d776c6af14daf6 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -38,12 +38,15 @@ industrial_ci_kinetic:
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   except:
     - tags
+    - melodic-devel
 
 industrial_ci_melodic:
   extends: .industrial_ci
   variables:
     ROS_DISTRO: melodic
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
+  only:
+    - melodic-devel
   except:
     - tags
   allow_failure: yes
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index e9bca39c72651aea5689aa20c2cb836c5ea48ea9..4579b4bf871c73f32f264cb78533edca20d48e80 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -40,12 +40,15 @@ industrial_ci_kinetic:
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   except:
     - tags
+    - melodic-devel
 
 industrial_ci_melodic:
   extends: .industrial_ci
   variables:
     ROS_DISTRO: melodic
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
+  only:
+    - melodic-devel
   except:
     - tags
   allow_failure: yes