diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index 788e752..8780cee 100644
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -4,8 +4,6 @@
     name: optf-cmso
     project-name: 'optf-cmso'
     jobs:
-      - gerrit-maven-clm:
-         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
       - '{project-name}-{stream}-verify-java-checkstyle':
          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
       - '{project-name}-{stream}-merge-properties-java':
@@ -48,3 +46,14 @@
     mvn-settings: 'optf-cmso-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: optf-cmso-clm
+    jobs:
+      - gerrit-maven-clm:
+         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+    project: optf/cmso
+    project-name: 'optf-cmso'
+    build-node: ubuntu1604-docker-8c-8g
+    branch: 'master'
+    mvn-settings: 'optf-cmso-settings'
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index 6860822..945e3d2 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -15,7 +15,6 @@
           pattern: 'conductor/**'
           pom: 'pom.xml'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-verify-java'
@@ -68,3 +67,12 @@
     mvn-settings: 'optf-has-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: optf-has-clm
+    jobs:
+      - gerrit-maven-clm
+    project: optf/has
+    project-name: 'optf-has'
+    branch: 'master'
+    mvn-settings: 'optf-has-settings'
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 8cc048d..6c6e2fc 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -15,7 +15,6 @@
           pattern: '**'
           pom: 'pom.xml'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
@@ -67,3 +66,12 @@
     mvn-settings: 'optf-osdf-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: optf-osdf-clm
+    jobs:
+      - gerrit-maven-clm
+    project: optf/osdf
+    project-name: 'optf-osdf'
+    branch: 'master'
+    mvn-settings: 'optf-osdf-settings'