diff --git a/.gitlab/ci/definitions.yml b/.gitlab/ci/definitions.yml
index 4beea63..ff0d3ad 100644
--- a/.gitlab/ci/definitions.yml
+++ b/.gitlab/ci/definitions.yml
@@ -21,5 +21,5 @@
 .build_and_deploy_custom:
   extends: .deploy
   script:
-    - ./scripts/custom-docker-build --label "ci_pipeline_url=$CI_PIPELINE_URL" --label "ci_job_url=$CI_JOB_URL" -t "$CI_REGISTRY_IMAGE:$1"
+    - ./scripts/custom-docker-build --label "ci_pipeline_url=$CI_PIPELINE_URL" --label "ci_job_url=$CI_JOB_URL"
     - ./scripts/custom-docker-push
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index 04445a0..4dfee12 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -288,7 +288,7 @@ function build_custom_if_needed() {
 
     # This re-uses and builds an existing image if needed
     docker pull --quiet "$full_image" || true
-    docker_command=$(generate_command $@ --cache-from="$full_image_name" )
+    docker_command=$(generate_command $@ --cache-from="$full_image_name" -t "$full_image_name")
     echo "Docker command:"
     printf "\t%s" "$docker_command"
     eval $docker_command