diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 91e1879dcdacf1ba02b1ecc676285ea8c1ebaaae..513148ab47fffd153e7cb78c5189916868baf394 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ stages:
                                             {{- $.DockerFroms . | join "\n" -}}
                                             {{- "\n" -}}
                                           {{- end -}}
-                                        {{- end -}}' $REPO \
+                                        {{- end -}}' $CI_PROJECT_NAME \
                  | { grep -vE '^$|^scratch$|^'"$CANONICAL_NAMESPACE/$CI_PROJECT_NAME"'(:|$)' || true; } \
                  | sort -u)"
     - echo "$parents"
@@ -43,7 +43,7 @@ stages:
       done
     - retry -t 3 -d 60 bashbrew build $CI_PROJECT_NAME
     - docker images
-    - bashbrew tag --target-namespace=$CANONICAL_NAMESPACE$ARCH $REPO
+    - bashbrew tag --target-namespace=$CANONICAL_NAMESPACE$ARCH $CI_PROJECT_NAME
   cache:
     paths:
       - cache