diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index a16f0aa..0720d89 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -3,7 +3,7 @@
     name: policy-api
     project-name: 'policy-api'
     jobs:
-      - '{project-name}-{stream}-clm'
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 53d6726..2d13f98 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -3,7 +3,7 @@
     name: policy-common
     project-name: 'policy-common'
     jobs:
-      - '{project-name}-{stream}-clm'
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 4378127..c322d70 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -3,7 +3,7 @@
     name: policy-drools-applications
     project-name: 'policy-drools-applications'
     jobs:
-      - '{project-name}-{stream}-clm'
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 5a740bd..1371895 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -3,7 +3,7 @@
     name: policy-drools-pdp
     project-name: 'policy-drools-pdp'
     jobs:
-      - '{project-name}-{stream}-clm'
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 8ee95e6..01219cb 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -3,7 +3,7 @@
     name: policy-engine
     project-name: 'policy-engine'
     jobs:
-      - '{project-name}-{stream}-clm':
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index db96845..7b96f0a 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -3,7 +3,7 @@
     name: policy-gui
     project-name: 'policy-gui'
     jobs:
-      - '{project-name}-{stream}-clm'
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index f0d15ba..da763bd 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -3,7 +3,7 @@
     name: policy-pap
     project-name: 'policy-pap'
     jobs:
-      - '{project-name}-{stream}-clm'
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily-no-sonar'
diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml
index 36e2616..1dec30a 100644
--- a/jjb/policy/policy-pdp.yaml
+++ b/jjb/policy/policy-pdp.yaml
@@ -3,7 +3,7 @@
     name: policy-pdp
     project-name: 'policy-pdp'
     jobs:
-      - '{project-name}-{stream}-clm'
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily-no-sonar'