diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index db848dd6e89c1a8e20d89672efd3433b85ebb801..6bfa429996059df13a17e3924770cd80606f9adb 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -1,7 +1,7 @@
 image: docker:git
 
 variables:
-  TMPDIR: "/builds/${CI_PROJECT_NAMESPACE}"
+  TMPDIR: "${CI_PROJECT_DIR}.tmp"
 
 services:
   - docker:dind
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 82c4d2b2135bdee130d4c29bbc10321064970576..a0cbdfc387e57f46266b9656c02fec0d07728910 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -1,7 +1,7 @@
 image: docker:git
 
 variables:
-  TMPDIR: "/builds/${CI_PROJECT_NAMESPACE}"
+  TMPDIR: "${CI_PROJECT_DIR}.tmp"
 
 services:
   - docker:dind