diff --git a/.flexbotics-ci-no-rosinstall.yml b/.flexbotics-ci-no-rosinstall.yml
new file mode 100644
index 0000000000000000000000000000000000000000..50620d9c4aede6238ebc7bb88152e851785931f5
--- /dev/null
+++ b/.flexbotics-ci-no-rosinstall.yml
@@ -0,0 +1,6 @@
+include: 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/.gitlab-industrial-ci.yml'
+
+industrial_ci_kinetic:
+  extends: .industrial_ci
+  variables:
+    ROS_DISTRO: kinetic
diff --git a/.flexbotics-ci-with-rosinstall.yml b/.flexbotics-ci-with-rosinstall.yml
new file mode 100644
index 0000000000000000000000000000000000000000..1a58026580d812d34765683cd98305e100a09265
--- /dev/null
+++ b/.flexbotics-ci-with-rosinstall.yml
@@ -0,0 +1,8 @@
+include: 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/.gitlab-industrial-ci.yml'
+
+industrial_ci_kinetic:
+  extends: .industrial_ci
+  variables:
+    ROS_DISTRO: kinetic
+    UPSTREAM_WORKSPACE: file
+    ROSINSTALL_FILENAME: ".rosinstall"
diff --git a/.gitlab-industrial-ci.yml b/.gitlab-industrial-ci.yml
index 623e46848e685876c06d59d84cd860d18a838397..66e23e266f38e7dd53eff8c1d721f70371e12eb9 100644
--- a/.gitlab-industrial-ci.yml
+++ b/.gitlab-industrial-ci.yml
@@ -13,9 +13,9 @@ before_script:
   - apk add --update bash coreutils tar wget
   - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
 
-industrial_ci_kinetic:
+.industrial_ci:
   stage: build
   script: .ci_config/gitlab.sh
   variables:
-    ROS_DISTRO: kinetic
-    ROS_PARALLEL_JOBS: "-j1" # keep this for now, since there seems to be memory limit issues in the ci VM
+    ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM
+    ROS_PARALLEL_TEST_JOBS: "-j1" # keep this for now, since there seems to be memory limit issues in the ci VM