diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 1923c76..42cfd7c 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -19,9 +19,9 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker'
+          mvn-params: '-P docker maven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -35,7 +35,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: policy-apex-pdp-sonar
@@ -47,7 +47,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-8c-8g
     project: 'policy/apex-pdp'
     project-name: 'policy-apex-pdp'
     branch: 'master'
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 5688d1f..61ac6fe 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -8,9 +8,9 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: "-P docker"
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -25,7 +25,7 @@
     mvn-settings: 'policy-docker-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-docker-base-common
@@ -37,7 +37,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           pattern: 'do_not_match_any_file'
       - '{project-name}-{stream}-merge-java':
           project-name: 'policy-docker-arm64'
@@ -60,7 +60,7 @@
                pattern: 'do_not_match_any_file'
       - gerrit-maven-docker-stage:
           project-name: 'policy-docker-amd64'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
           container-public-registry: 'docker.io'
@@ -70,7 +70,7 @@
              - compare-type: REG_EXP
                pattern: 'do_not_match_any_file'
       - '{project-name}-docker-manifest-{stream}':
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - '{project-name}-multiarch-docker-stage-{stream}'
 #      - '{project-name}-gerrit-release-jobs':
 #          build-node: centos7-docker-8c-8g
@@ -82,7 +82,7 @@
     mvn-settings: 'policy-docker-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-docker-clm
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 7935f33..32c4257 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -15,7 +15,7 @@
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker'
+          mvn-params: '-P docker  -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 25b45e0..6440e35 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -13,9 +13,9 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker'
+          mvn-params: '-P docker  -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -29,7 +29,7 @@
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: policy-drools-pdp-sonar
@@ -41,7 +41,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/drools-pdp'
     project-name: 'policy-drools-pdp'
     branch: 'master'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 0ebc274..1f6eb30 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -15,7 +15,7 @@
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker'
+          mvn-params: '-P docker  -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 5b82536..862c040 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -18,10 +18,10 @@
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-          enabled: false
+          disabled: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-builder-4c-4g
-          enabled: false
+          disabled: true
 
     project: 'policy/gui'
     stream: