diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f563fb8641d56e064235c50ed45e7bcfabe227b4..93da1dbe8f63a72723e977e79a046416d5ce9a12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,15 +40,15 @@ variables:
 
 .docker:
   image: docker:latest
-  tags: [ redshift ]
+  tags: [redshift]
   services:
     - docker:dind
   before_script:
-    - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
-    #- docker login -u "${CI_BUILD_USER}" -p "${CI_BUILD_TOKEN}"
+    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY} || true
+  after_script:
+    - docker logout ${CI_REGISTRY}
   allow_failure: false
 
-
 # ---------------------------------------------------------------
 # Build jobs
 # ---------------------------------------------------------------
@@ -57,9 +57,7 @@ fast-build:
   extends: .build
   image: ${CONTAINER_BUILD_IMAGE}
   before_script:
-    - mv /customCache/node_modules ./
-    - cp -rf /customCache/www ./
-    - cp -rf /customCache/hooks ./
+    - mv /.build-cache/node_modules ./
   only:
     - develop
 
@@ -79,7 +77,7 @@ docker-for-fast-build:
   allow_failure: true
   before_script:
     - echo 'FROM node:12' > Dockerfile
-    - echo 'WORKDIR /customCache' >> Dockerfile
+    - echo 'WORKDIR /.build-cache' >> Dockerfile
     - echo 'COPY ./ ./' >> Dockerfile
     - echo 'RUN du -s `find . -maxdepth 1 | egrep -v "^\.$"`>/before.txt' >> Dockerfile
     - echo 'RUN yarn' >> Dockerfile