diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba1bd4bf2f7bd62b63e6ad1ee22f894e53926c5c..f97228e42d737cacddc007c2e95cb7ac8c64e4ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ services:
 variables:
   CONTAINER_TEST_IMAGE: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
   CONTAINER_RELEASE_IMAGE: "$CI_REGISTRY_IMAGE:latest"
-  CONTAINER_TAG_IMAGE: "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+  CONTAINER_CACHE_IMAGE: "$CI_REGISTRY_IMAGE:master"
 
 stages:
   - build
@@ -24,8 +24,8 @@ build:
   <<: *runner_tags
   stage: build
   script:
-    - docker pull "$CONTAINER_TEST_IMAGE"
-    - docker build --pull --cache-from "$CONTAINER_TEST_IMAGE" -t "$CONTAINER_TEST_IMAGE" .
+    - docker pull "$CONTAINER_CACHE_IMAGE" || true
+    - docker build --pull --cache-from "$CONTAINER_CACHE_IMAGE" -t "$CONTAINER_TEST_IMAGE" .
     - docker push "$CONTAINER_TEST_IMAGE"
 
 test:
@@ -50,8 +50,6 @@ release-image:
   script:
     - docker pull "$CONTAINER_TEST_IMAGE"
     - docker tag "$CONTAINER_TEST_IMAGE" "$CONTAINER_RELEASE_IMAGE"
-    - docker tag "$CONTAINER_TEST_IMAGE" "$CONTAINER_TAG_IMAGE"
     - docker push "$CONTAINER_RELEASE_IMAGE"
-    - docker push "$CONTAINER_TAG_IMAGE"
   only:
     - tags