diff --git a/vars/gerritPipeline.groovy b/vars/gerritPipeline.groovy
index fa7dd53..040cd6f 100644
--- a/vars/gerritPipeline.groovy
+++ b/vars/gerritPipeline.groovy
@@ -87,8 +87,7 @@
     String consoleUrl
 
     GerritCheck(name, build) {
-        this.uuid = "gerritforge:" + name.replaceAll("(bazel/)", "") +
-            Globals.gerritRepositoryNameSha1Suffix
+        this.uuid = "gerritforge:${env.GERRIT_PROJECT}-${name}"
         this.build = build
         this.consoleUrl = "${build.url}console"
     }