diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 8ff1f05aa87f6866592b227774c1fa94640daa12..cdffd6e4f332e1f522118bc0cf5ba99cd993db55 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -40,8 +40,7 @@ industrial_ci_kinetic:
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   except:
     - tags
-    - melodic-devel
-    - melodic-test
+    - melodic-*
 
 industrial_ci_melodic:
   extends: .industrial_ci
@@ -49,8 +48,7 @@ industrial_ci_melodic:
     ROS_DISTRO: melodic
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   only:
-    - melodic-devel
-    - melodic-test
+    - melodic-*
   except:
     - tags
 
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 4e2d9ded8424040d5f1d26d8ccf8d7bc982670a5..ffc3b21dcbacc558402c872096087cc7f2872720 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -42,8 +42,7 @@ industrial_ci_kinetic:
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   except:
     - tags
-    - melodic-devel
-    - melodic-test
+    - melodic-*
 
 industrial_ci_melodic:
   extends: .industrial_ci
@@ -51,8 +50,7 @@ industrial_ci_melodic:
     ROS_DISTRO: melodic
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
   only:
-    - melodic-devel
-    - melodic-test
+    - melodic-*
   except:
     - tags