diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 59d085f47f8f50b36e09aea85736b25d4cc59dd3..d5cc20df6a56bf2802daeaeb7688402a999995a0 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -47,6 +47,8 @@ industrial_ci_kinetic:
       when: never
     - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
       when: never
+    - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/
+      when: never
     - when: always
 
 industrial_ci_melodic:
@@ -59,6 +61,16 @@ industrial_ci_melodic:
       when: never
     - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
 
+industrial_ci_noetic:
+  extends: .industrial_ci
+  variables:
+    ROS_DISTRO: noetic
+    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+    - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/
+
 industrial_ci_kinetic_deploy:
   extends: .industrial_ci
   variables:
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 4c24ca442e9343d77eda93a70858885a06ceea9b..643b46b90f57fd6dc841bab60ea50fbb85243083 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -49,6 +49,8 @@ industrial_ci_kinetic:
       when: never
     - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
       when: never
+    - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/
+      when: never
     - when: always
 
 industrial_ci_melodic:
@@ -61,6 +63,16 @@ industrial_ci_melodic:
       when: never
     - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
 
+industrial_ci_noetic:
+  extends: .industrial_ci
+  variables:
+    ROS_DISTRO: noetic
+    DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+    - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/
+
 industrial_ci_kinetic_deploy:
   extends: .industrial_ci
   variables: