diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index 9758bba..5d439e8 100644
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-clamp
+    name: policy-clamp-java-17
     project-name: "policy-clamp"
     jobs:
       - gerrit-maven-stage:
@@ -17,7 +17,6 @@
           container-staging-registry: "nexus3.onap.org:10003"
           mvn-params: "-Dmaven.test.skip=true -P docker"
       - "{project-name}-{stream}-verify-java":
-          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-16g
       - "{project-name}-{stream}-merge-java":
           build-node: ubuntu1804-docker-8c-16g
@@ -27,8 +26,6 @@
 
     project: "policy/clamp"
     stream:
-      - "master":
-          branch: "master"
       - "java-17":
           branch: "java-17"
     mvn-settings: "policy-clamp-settings"
@@ -65,6 +62,8 @@
 
     project: "policy/clamp"
     stream:
+      - "master":
+          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -97,7 +96,7 @@
     mvn-settings: "policy-clamp-settings"
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
-    java-version: openjdk17
+    java-version: openjdk11
 
 - project:
     name: policy-clamp-clm
@@ -111,4 +110,4 @@
           branch: "master"
     mvn-settings: "policy-clamp-settings"
     build-node: ubuntu1804-docker-8c-8g
-    java-version: openjdk17
+    java-version: openjdk11