diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ecd656c188b7a956c46d41f43de85f8a5fc9036..bb21dd0e6069ecbb5fb2296d4120ae74a635e1a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,20 +6,22 @@ stages:
   - build
   - push
 
-variables:
-  CI_REGISTRY: registry.biblio19.net:5005
-  IMAGE_TAG: $CI_REGISTRY/school/capstone-design/02/jupyterhub-gpu
 before_script:
   - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
 
 build:
   stage: build  
   script:
-    - docker build -t $IMAGE_TAG . --no-cache
+    # https://docs.gitlab.com/ee/ci/docker/docker_layer_caching.html
+    - docker pull $CI_REGISTRY_IMAGE:latest || true
+    # Caching
+    - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --tag $CI_REGISTRY_IMAGE:latest .
+    # - docker build -t $IMAGE_TAG . --no-cache
     
 push:
   stage: push
   script:
-    - docker push $IMAGE_TAG
+    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
+    - docker push $CI_REGISTRY_IMAGE:latest
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
\ No newline at end of file