diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index a6ef310ac52642481c52f33e0a8a716bb097a964..3a0ffdc65f955f4b5293e9d1dd296ceef725a182 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -35,6 +35,19 @@ industrial_ci_kinetic:
   except:
     - tags
 
+industrial_ci_kinetic_deploy:
+  extends: .industrial_ci_kinetic
+  variables:
+    AFTER_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/scripts/pre-deploy-cleanup.bash | bash"
+  after_script:
+    - cd $(mktemp -d)
+    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/deploy/Dockerfile
+    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/deploy/ros_entrypoint.bash
+    - docker build -t ${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} .
+    - docker push ${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}
+  only:
+    - tags
+
 ##########################################################
 ## Simple check for basic Python syntax errors; this is much less thorough than
 ## other options like pylint, but much faster and less strict
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 85e80b62460005dac490fe4bb1c3805f735a880f..04c1f1b6f1fb26c4d58068cf23533c77403bd701 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -37,6 +37,19 @@ industrial_ci_kinetic:
   except:
     - tags
 
+industrial_ci_kinetic_deploy:
+  extends: .industrial_ci_kinetic
+  variables:
+    AFTER_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/scripts/pre-deploy-cleanup.bash | bash"
+  after_script:
+    - cd $(mktemp -d)
+    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/deploy/Dockerfile
+    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/deploy/ros_entrypoint.bash
+    - docker build -t ${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} .
+    - docker push ${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}
+  only:
+    - tags
+
 ##########################################################
 ## Simple check for basic Python syntax errors; this is much less thorough than
 ## other options like pylint, but much faster and less strict