diff --git a/jjb/acumos/model-deployments-deployment-client/model-deployments-deployment-client-verify-jobs.yaml b/jjb/acumos/model-deployments-deployment-client/model-deployments-deployment-client-verify-jobs.yaml
index 5829d9f..8a9fde2 100644
--- a/jjb/acumos/model-deployments-deployment-client/model-deployments-deployment-client-verify-jobs.yaml
+++ b/jjb/acumos/model-deployments-deployment-client/model-deployments-deployment-client-verify-jobs.yaml
@@ -21,6 +21,6 @@
     name: model-deployments-deployment-client-verify
     project: model-deployments/deployment-client
     project-name: model-deployments-deployment-client
-    jdk-version: java-8
+    jdk-version: java-11
     jobs:
       - 'acumos-{project-name}-verify-java'
diff --git a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
index 1cff8df..3050946 100644
--- a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
+++ b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
@@ -157,7 +157,9 @@
             - 'cloud-infra-verify-engine-.*'
             - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
             - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
@@ -317,7 +319,7 @@
           description: 'Name of heat-environment file to use.'
       - string:
           name: HEAT_ENVIRONMENT_FILE
-          default: "file://$WORKSPACE/engine/provisioner/heat/playbooks/roles/install-configure-heat/files/$HEAT_ENVIRONMENT_FILENAME"
+          default: "file://$WORKSPACE/engine/provisioner/heat/playbooks/roles/bootstrap-hwconfig/files/$HEAT_ENVIRONMENT_FILENAME"
           description: 'Location of heat-environment file to use.'
       - string:
           name: STACK_NAME
diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index 15857fa..9ee1c1b 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -127,7 +127,9 @@
             - 'cloud-infra-verify-engine-.*'
             - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
             - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
diff --git a/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml b/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml
index 98472a3..e054ccd 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml
@@ -148,9 +148,13 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
             - 'os-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index d3456d3..4af1d40 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -180,9 +180,13 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
             - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
diff --git a/jjb/cloud-infra/cloud-infra-periodic-openstack.yml b/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
index 302afee..6d00ae2 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
+++ b/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
@@ -166,9 +166,13 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
             - 'os-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
diff --git a/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml b/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
index 52bf8f9..d0669c5 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
@@ -156,9 +156,13 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
             - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
diff --git a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
index f1a4eb5..01a52d4 100644
--- a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
@@ -124,7 +124,9 @@
             - 'cloud-infra-verify-engine-.*'
             - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
             - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
diff --git a/jjb/nolabs/nolabs-booking-jobs.yaml b/jjb/nolabs/nolabs-booking-jobs.yaml
index 313c53b..accdf39 100644
--- a/jjb/nolabs/nolabs-booking-jobs.yaml
+++ b/jjb/nolabs/nolabs-booking-jobs.yaml
@@ -125,11 +125,11 @@
           description: 'Python virtualenv location to use.'
       - string:
           name: GERRIT_REFSPEC
-          default: 'refs/changes/79/2079/8'
+          default: 'refs/changes/79/2079/10'
           description: 'Refspec to checkout'
       - string:
           name: HEAT_ENVIRONMENT_FILE
-          default: 'https://gerrit.nordix.org/gitweb?p=infra/engine.git;a=blob_plain;f=engine/provisioner/heat/playbooks/roles/install-configure-heat/files/heat-environment.yaml;h=401e1c4f547e9a2631e68d800cbcadef81b85641;hb=70df134c93b7ca3232ae723c3de98ad2b0299728'
+          default: "file://$WORKSPACE/engine/provisioner/heat/playbooks/roles/bootstrap-hwconfig/files/heat-environment.yaml"
           description: 'Using a special heat environment file until the change gets merged.'
 
     properties: