diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f785f3..a1233a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,10 @@ workflow:
 cache:
   key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
 
+# Build on tmpfs
+variables:
+  GIT_CLONE_PATH: $CI_BUILDS_DIR/tmpfs/$CI_PROJECT_NAME/$CI_COMMIT_BRANCH
+
 stages:
   - quality
   - Docker-hub-build
diff --git a/gitlabci/docker-hub.yml b/gitlabci/docker-hub.yml
index 4cd0a2b..c8df52a 100644
--- a/gitlabci/docker-hub.yml
+++ b/gitlabci/docker-hub.yml
@@ -18,7 +18,6 @@ docker-hub-build:
     - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v6/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1)
     - docker build --build-arg SQUID_VERSION=$SQUID_VERSION --pull -t $CONTAINER_BUILD_NOPROD_NAME_AMD64 .
     - docker push $CONTAINER_BUILD_NOPROD_NAME_AMD64
-    - chown -Rf 1161 $CI_BUILDS_DIR
 
 .services-amd64:
   services:
@@ -72,8 +71,6 @@ push-docker-hub:
     - docker push $HUB_REGISTRY_IMAGE:latest-amd64
     - docker tag $CONTAINER_BUILD_NOPROD_NAME_AMD64 $HUB_REGISTRY_IMAGE:latest
     - docker push $HUB_REGISTRY_IMAGE:latest
-# Restore rights
-    - chown -Rf root $CI_BUILDS_DIR
   variables:
     GIT_STRATEGY: none
   needs: ["docker-hub-test"]