diff --git a/jjb/cloud-infra/cloud-infra-deploy.sh b/jjb/cloud-infra/cloud-infra-deploy.sh
index 1a3ebdd..ae8c798 100644
--- a/jjb/cloud-infra/cloud-infra-deploy.sh
+++ b/jjb/cloud-infra/cloud-infra-deploy.sh
@@ -47,6 +47,6 @@
 
 # execute cloud engine deploy.sh script
 cd $WORKSPACE
-./engine/deploy.sh -d $INSTALLER_TYPE -s $DEPLOY_SCENARIO -p $PDF -i $IDF -c
+./engine/deploy.sh -d $INSTALLER_TYPE -o $DISTRO -s $DEPLOY_SCENARIO -p $PDF -i $IDF -c
 
 # vim: set ts=2 sw=2 expandtab:
diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index 6fbdd92..54b16b9 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -45,19 +45,11 @@
           branch: '{stream}'
           disabled: 'false'
 
-    os:
+    distro:
       - ubuntu1804:
           disabled: 'false'
-          distribution: 'ubuntu18'
-          ipa_dib_os_element: 'coreos'
-          dib_os_release: 'bionic'
-          dib_os_element: 'ubuntu-minimal'
       - centos7:
           disabled: 'true'
-          distribution: 'centos7'
-          ipa_dib_os_element: 'coreos'
-          dib_os_release: '7'
-          dib_os_element: 'centos-minimal'
 
     type:
       - virtual:
@@ -78,11 +70,11 @@
           build-timeout: 30
 
     jobs:
-      - 'cloud-infra-periodic-engine-{os}-{type}-{stream}'
-      - 'cloud-infra-periodic-{os}-{phase}-{type}-{stream}'
+      - 'cloud-infra-periodic-engine-{distro}-{type}-{stream}'
+      - 'cloud-infra-periodic-{distro}-{phase}-{type}-{stream}'
 
 - job-template:
-    name: 'cloud-infra-periodic-engine-{os}-{type}-{stream}'
+    name: 'cloud-infra-periodic-engine-{distro}-{type}-{stream}'
 
     project-type: multijob
 
@@ -100,8 +92,8 @@
           default: '{slave-label}'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
-          name: DISTRIBUTION
-          default: '{distribution}'
+          name: DISTRO
+          default: '{distro}'
           description: 'Distribution to use for configuring target nodes (networking etc.)'
       - string:
           name: DEPLOY_TYPE
@@ -112,18 +104,6 @@
           default: 'true'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
       - string:
-          name: IPA_DIB_OS_ELEMENT
-          default: '{ipa_dib_os_element}'
-          description: 'DIB OS Element to use for building the ramdisk image'
-      - string:
-          name: DIB_OS_RELEASE
-          default: '{dib_os_release}'
-          description: 'DIB OS Release to use for building the deployment image to provision target nodes with'
-      - string:
-          name: DIB_OS_ELEMENT
-          default: '{dib_os_element}'
-          description: 'DIB OS Element to use for building the deployment image to provision target nodes with'
-      - string:
           name: INSTALLER_TYPE
           default: 'kubespray'
           description: 'Installer to use for deploying the scenario'
@@ -149,9 +129,9 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-verify-engine-{os}-.*'
-            - 'cloud-infra-verify-scenario-{os}-.*'
-            - 'cloud-infra-periodic-engine-{os}-.*'
+            - 'cloud-infra-verify-engine-{distro}-.*'
+            - 'cloud-infra-verify-scenario-{distro}-.*'
+            - 'cloud-infra-periodic-engine-{distro}-.*'
             - 'cloud-infra-os-.*'
             - 'cloud-infra-k8-.*'
           block-level: 'NODE'
@@ -179,15 +159,12 @@
           name: deploy
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-periodic-{os}-deploy-{type}-{stream}'
+            - name: 'cloud-infra-periodic-{distro}-deploy-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
-                IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
-                DIB_OS_RELEASE=$DIB_OS_RELEASE
-                DIB_OS_ELEMENT=$DIB_OS_ELEMENT
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 CLEANUP=$CLEANUP
@@ -199,10 +176,10 @@
           name: functest
           condition: ALWAYS
           projects:
-            - name: 'cloud-infra-periodic-{os}-functest-{type}-{stream}'
+            - name: 'cloud-infra-periodic-{distro}-functest-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -216,10 +193,10 @@
           name: yardstick
           condition: ALWAYS
           projects:
-            - name: 'cloud-infra-periodic-{os}-yardstick-{type}-{stream}'
+            - name: 'cloud-infra-periodic-{distro}-yardstick-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -231,7 +208,7 @@
               abort-all-job: false
 
 - job-template:
-    name: 'cloud-infra-periodic-{os}-{phase}-{type}-{stream}'
+    name: 'cloud-infra-periodic-{distro}-{phase}-{type}-{stream}'
 
     disabled: false
 
@@ -245,8 +222,8 @@
           name: PROJECT
           default: $GERRIT_PROJECT
       - string:
-          name: DISTRIBUTION
-          default: 'ubuntu18'
+          name: DISTRO
+          default: 'ubuntu1804'
           description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
       - string:
           name: DEPLOY_TYPE
@@ -257,18 +234,6 @@
           default: 'false'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
       - string:
-          name: IPA_DIB_OS_ELEMENT
-          default: 'fedora'
-          description: 'DIB OS Element to use for building the ramdisk image. Overriden by upstream job.'
-      - string:
-          name: DIB_OS_RELEASE
-          default: 'bionic'
-          description: 'DIB OS Release to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
-      - string:
-          name: DIB_OS_ELEMENT
-          default: 'ubuntu-minimal'
-          description: 'DIB OS Element to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
-      - string:
           name: ENGINE_ANSIBLE_PARAMS
           default: ' -v '
           description: 'Extra paramters that can be added when run the play books.'
diff --git a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
index 537fe29..a0253d4 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
@@ -45,19 +45,11 @@
           branch: '{stream}'
           disabled: 'false'
 
-    os:
+    distro:
       - ubuntu1804:
           disabled: 'false'
-          distribution: 'ubuntu18'
-          ipa_dib_os_element: 'coreos'
-          dib_os_release: 'bionic'
-          dib_os_element: 'ubuntu-minimal'
       - centos7:
           disabled: 'true'
-          distribution: 'centos7'
-          ipa_dib_os_element: 'coreos'
-          dib_os_release: '7'
-          dib_os_element: 'centos-minimal'
 
     deploy-scenario:
       - k8-calico-nofeature:
@@ -89,11 +81,11 @@
           build-timeout: 5
 
     jobs:
-      - '{deploy-scenario}-periodic-{os}-{type}-{stream}'
-      - 'scenario-periodic-{os}-{phase}-{type}-{stream}'
+      - '{deploy-scenario}-periodic-{distro}-{type}-{stream}'
+      - 'scenario-periodic-{distro}-{phase}-{type}-{stream}'
 
 - job-template:
-    name: '{deploy-scenario}-periodic-{os}-{type}-{stream}'
+    name: '{deploy-scenario}-periodic-{distro}-{type}-{stream}'
 
     project-type: multijob
 
@@ -111,8 +103,8 @@
           default: '{slave-label}'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
-          name: DISTRIBUTION
-          default: '{distribution}'
+          name: DISTRO
+          default: '{distro}'
           description: 'Distribution to use for configuring target nodes (networking etc.)'
       - string:
           name: DEPLOY_TYPE
@@ -123,18 +115,6 @@
           default: 'true'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
       - string:
-          name: IPA_DIB_OS_ELEMENT
-          default: '{ipa_dib_os_element}'
-          description: 'DIB OS Element to use for building the ramdisk image'
-      - string:
-          name: DIB_OS_RELEASE
-          default: '{dib_os_release}'
-          description: 'DIB OS Release to use for building the deployment image to provision target nodes with'
-      - string:
-          name: DIB_OS_ELEMENT
-          default: '{dib_os_element}'
-          description: 'DIB OS Element to use for building the deployment image to provision target nodes with'
-      - string:
           name: INSTALLER_TYPE
           default: '{installer-type}'
           description: 'Installer to use for deploying the scenario'
@@ -160,7 +140,7 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-periodic-engine-{os}-.*'
+            - 'cloud-infra-periodic-engine-{distro}-.*'
             - 'k8-.*?-periodic-.*'
           block-level: 'NODE'
       - throttle:
@@ -189,15 +169,12 @@
           name: deploy
           condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{os}-deploy-{type}-{stream}'
+            - name: 'scenario-periodic-{distro}-deploy-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
-                IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
-                DIB_OS_RELEASE=$DIB_OS_RELEASE
-                DIB_OS_ELEMENT=$DIB_OS_ELEMENT
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 CLEANUP=$CLEANUP
@@ -209,10 +186,10 @@
           name: functest
           condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{os}-functest-{type}-{stream}'
+            - name: 'scenario-periodic-{distro}-functest-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -226,10 +203,10 @@
           name: yardstick
           condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{os}-yardstick-{type}-{stream}'
+            - name: 'scenario-periodic-{distro}-yardstick-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -243,10 +220,10 @@
           name: promote
           condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{os}-promote-{type}-{stream}'
+            - name: 'scenario-periodic-{distro}-promote-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -258,7 +235,7 @@
               abort-all-job: true
 
 - job-template:
-    name: 'scenario-periodic-{os}-{phase}-{type}-{stream}'
+    name: 'scenario-periodic-{distro}-{phase}-{type}-{stream}'
 
     disabled: false
 
@@ -272,8 +249,8 @@
           name: PROJECT
           default: $GERRIT_PROJECT
       - string:
-          name: DISTRIBUTION
-          default: 'ubuntu18'
+          name: DISTRO
+          default: 'ubuntu1804'
           description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
       - string:
           name: DEPLOY_TYPE
@@ -284,18 +261,6 @@
           default: 'false'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
       - string:
-          name: IPA_DIB_OS_ELEMENT
-          default: 'fedora'
-          description: 'DIB OS Element to use for building the ramdisk image. Overriden by upstream job.'
-      - string:
-          name: DIB_OS_RELEASE
-          default: 'bionic'
-          description: 'DIB OS Release to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
-      - string:
-          name: DIB_OS_ELEMENT
-          default: 'ubuntu-minimal'
-          description: 'DIB OS Element to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
-      - string:
           name: ENGINE_ANSIBLE_PARAMS
           default: ' -v '
           description: 'Extra paramters that can be added when run the play books.'
diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index 6922f75..a64d69c 100644
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -52,19 +52,19 @@
           branch: '{stream}'
           disabled: 'false'
 
-    os:
+    distro:
       - ubuntu1804:
-          disabled: 'false'
-          distribution: 'ubuntu18'
-          ipa_dib_os_element: 'coreos'
-          dib_os_release: 'bionic'
-          dib_os_element: 'ubuntu-minimal'
+          disabled: false
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
       - centos7:
-          disabled: 'true'
-          distribution: 'centos7'
-          ipa_dib_os_element: 'coreos'
-          dib_os_release: '7'
-          dib_os_element: 'centos-minimal'
+          disabled: false
+          successful: true
+          failed: true
+          unstable: true
+          notbuilt: true
 
     type:
       - virtual
@@ -74,11 +74,11 @@
       - functest
 
     jobs:
-      - 'cloud-infra-verify-engine-{os}-{type}-{stream}'
-      - 'cloud-infra-verify-engine-{os}-{phase}-{type}-{stream}'
+      - 'cloud-infra-verify-engine-{distro}-{type}-{stream}'
+      - 'cloud-infra-verify-engine-{distro}-{phase}-{type}-{stream}'
 
 - job-template:
-    name: 'cloud-infra-verify-engine-{os}-{type}-{stream}'
+    name: 'cloud-infra-verify-engine-{distro}-{type}-{stream}'
 
     project-type: multijob
 
@@ -96,8 +96,8 @@
           default: 'vpod-deploy-city'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
-          name: DISTRIBUTION
-          default: '{distribution}'
+          name: DISTRO
+          default: '{distro}'
           description: 'Distribution to use for configuring target nodes (networking etc.)'
       - string:
           name: DEPLOY_TYPE
@@ -108,18 +108,6 @@
           default: 'true'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
       - string:
-          name: IPA_DIB_OS_ELEMENT
-          default: '{ipa_dib_os_element}'
-          description: 'DIB OS Element to use for building the ramdisk image'
-      - string:
-          name: DIB_OS_RELEASE
-          default: '{dib_os_release}'
-          description: 'DIB OS Release to use for building the deployment image to provision target nodes with'
-      - string:
-          name: DIB_OS_ELEMENT
-          default: '{dib_os_element}'
-          description: 'DIB OS Element to use for building the deployment image to provision target nodes with'
-      - string:
           name: TEST_SUITE
           default: 'healthcheck'
           description: 'Test suite to run'
@@ -137,9 +125,9 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-verify-engine-{os}-.*'
-            - 'cloud-infra-verify-scenario-{os}-.*'
-            - 'cloud-infra-periodic-engine-{os}-.*'
+            - 'cloud-infra-verify-engine-{distro}-.*'
+            - 'cloud-infra-verify-scenario-{distro}-.*'
+            - 'cloud-infra-periodic-engine-{distro}-.*'
             - 'cloud-infra-os-.*'
             - 'cloud-infra-k8-.*'
           block-level: 'NODE'
@@ -164,6 +152,12 @@
           project: 'infra\/engine'
           branch: '{branch}'
           files: '**'
+          custom-url: '* $JOB_NAME $BUILD_URL'
+          skip-vote:
+            successful: '{obj:successful}'
+            failed: '{obj:failed}'
+            unstable: '{obj:unstable}'
+            notbuilt: '{obj:notbuilt}'
 
     builders:
       - 'cloud-infra-determine-scenario-macro'
@@ -171,15 +165,12 @@
           name: deploy
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-engine-{os}-deploy-{type}-{stream}'
+            - name: 'cloud-infra-verify-engine-{distro}-deploy-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
-                IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
-                DIB_OS_RELEASE=$DIB_OS_RELEASE
-                DIB_OS_ELEMENT=$DIB_OS_ELEMENT
                 CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -193,15 +184,12 @@
           name: functest
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-engine-{os}-functest-{type}-{stream}'
+            - name: 'cloud-infra-verify-engine-{distro}-functest-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
-                IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
-                DIB_OS_RELEASE=$DIB_OS_RELEASE
-                DIB_OS_ELEMENT=$DIB_OS_ELEMENT
                 TEST_SUITE=$TEST_SUITE
                 YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
                 CLEANUP=$CLEANUP
@@ -215,7 +203,7 @@
               abort-all-job: true
 
 - job-template:
-    name: 'cloud-infra-verify-engine-{os}-{phase}-{type}-{stream}'
+    name: 'cloud-infra-verify-engine-{distro}-{phase}-{type}-{stream}'
 
     disabled: false
 
@@ -229,8 +217,8 @@
           name: PROJECT
           default: $GERRIT_PROJECT
       - string:
-          name: DISTRIBUTION
-          default: 'ubuntu18'
+          name: DISTRO
+          default: 'ubuntu1804'
           description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
       - string:
           name: DEPLOY_TYPE
@@ -241,18 +229,6 @@
           default: 'false'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
       - string:
-          name: IPA_DIB_OS_ELEMENT
-          default: 'fedora'
-          description: 'DIB OS Element to use for building the ramdisk image. Overriden by upstream job.'
-      - string:
-          name: DIB_OS_RELEASE
-          default: 'bionic'
-          description: 'DIB OS Release to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
-      - string:
-          name: DIB_OS_ELEMENT
-          default: 'ubuntu-minimal'
-          description: 'DIB OS Element to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
-      - string:
           name: TEST_FW
           default: '{phase}'
           description: 'Test framework to use'
diff --git a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
index fa47312..5b300a5 100644
--- a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
@@ -49,13 +49,19 @@
           branch: '{stream}'
           disabled: 'false'
 
-    os:
+    distro:
       - ubuntu1804:
-          disabled: 'false'
-          distribution: 'ubuntu18'
-          ipa_dib_os_element: 'coreos'
-          dib_os_release: 'bionic'
-          dib_os_element: 'ubuntu-minimal'
+          disabled: false
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
+      - centos7:
+          disabled: false
+          successful: true
+          failed: true
+          unstable: true
+          notbuilt: true
 
     type:
       - virtual:
@@ -68,11 +74,11 @@
           build-timeout: 30
 
     jobs:
-      - 'cloud-infra-verify-scenario-{os}-{type}-{stream}'
-      - 'cloud-infra-verify-scenario-{os}-{phase}-{type}-{stream}'
+      - 'cloud-infra-verify-scenario-{distro}-{type}-{stream}'
+      - 'cloud-infra-verify-scenario-{distro}-{phase}-{type}-{stream}'
 
 - job-template:
-    name: 'cloud-infra-verify-scenario-{os}-{type}-{stream}'
+    name: 'cloud-infra-verify-scenario-{distro}-{type}-{stream}'
 
     project-type: multijob
 
@@ -90,8 +96,8 @@
           default: '{slave-label}'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
-          name: DISTRIBUTION
-          default: '{distribution}'
+          name: DISTRO
+          default: '{distro}'
           description: 'Distribution to use for configuring target nodes (networking etc.)'
       - string:
           name: DEPLOY_TYPE
@@ -102,18 +108,6 @@
           default: 'true'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
       - string:
-          name: IPA_DIB_OS_ELEMENT
-          default: '{ipa_dib_os_element}'
-          description: 'DIB OS Element to use for building the ramdisk image'
-      - string:
-          name: DIB_OS_RELEASE
-          default: '{dib_os_release}'
-          description: 'DIB OS Release to use for building the deployment image to provision target nodes with'
-      - string:
-          name: DIB_OS_ELEMENT
-          default: '{dib_os_element}'
-          description: 'DIB OS Element to use for building the deployment image to provision target nodes with'
-      - string:
           name: TEST_SUITE
           default: 'healthcheck'
           description: 'Test suite to run'
@@ -127,9 +121,9 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-verify-engine-{os}-.*'
-            - 'cloud-infra-verify-scenario-{os}-.*'
-            - 'cloud-infra-periodic-engine-{os}-.*'
+            - 'cloud-infra-verify-engine-{distro}-.*'
+            - 'cloud-infra-verify-scenario-{distro}-.*'
+            - 'cloud-infra-periodic-engine-{distro}-.*'
             - 'cloud-infra-os-.*'
             - 'cloud-infra-k8-.*'
           block-level: 'NODE'
@@ -154,6 +148,12 @@
           project: 'infra\/swconfig'
           branch: '{branch}'
           files: '**'
+          custom-url: '* $JOB_NAME $BUILD_URL'
+          skip-vote:
+            successful: '{obj:successful}'
+            failed: '{obj:failed}'
+            unstable: '{obj:unstable}'
+            notbuilt: '{obj:notbuilt}'
 
     builders:
       - 'cloud-infra-determine-scenario-macro'
@@ -161,15 +161,12 @@
           name: deploy
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-scenario-{os}-deploy-{type}-{stream}'
+            - name: 'cloud-infra-verify-scenario-{distro}-deploy-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
-                IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
-                DIB_OS_RELEASE=$DIB_OS_RELEASE
-                DIB_OS_ELEMENT=$DIB_OS_ELEMENT
                 CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -183,15 +180,12 @@
           name: functest
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-scenario-{os}-functest-{type}-{stream}'
+            - name: 'cloud-infra-verify-scenario-{distro}-functest-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
-                IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
-                DIB_OS_RELEASE=$DIB_OS_RELEASE
-                DIB_OS_ELEMENT=$DIB_OS_ELEMENT
                 TEST_SUITE=$TEST_SUITE
                 CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
@@ -204,7 +198,7 @@
               abort-all-job: true
 
 - job-template:
-    name: 'cloud-infra-verify-scenario-{os}-{phase}-{type}-{stream}'
+    name: 'cloud-infra-verify-scenario-{distro}-{phase}-{type}-{stream}'
 
     disabled: false
 
@@ -218,8 +212,8 @@
           name: PROJECT
           default: $GERRIT_PROJECT
       - string:
-          name: DISTRIBUTION
-          default: 'ubuntu18'
+          name: DISTRO
+          default: 'ubuntu1804'
           description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
       - string:
           name: DEPLOY_TYPE
@@ -230,18 +224,6 @@
           default: 'false'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
       - string:
-          name: IPA_DIB_OS_ELEMENT
-          default: 'fedora'
-          description: 'DIB OS Element to use for building the ramdisk image. Overriden by upstream job.'
-      - string:
-          name: DIB_OS_RELEASE
-          default: 'bionic'
-          description: 'DIB OS Release to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
-      - string:
-          name: DIB_OS_ELEMENT
-          default: 'ubuntu-minimal'
-          description: 'DIB OS Element to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
-      - string:
           name: TEST_FW
           default: '{phase}'
           description: 'Test framework to use'
diff --git a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
index 2f76b72..e169b69 100644
--- a/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-testfw.yaml
@@ -52,13 +52,9 @@
           branch: '{stream}'
           disabled: 'false'
 
-    os:
+    distro:
       - ubuntu1804:
           disabled: 'false'
-          distribution: 'ubuntu18'
-      - centos7:
-          disabled: 'true'
-          distribution: 'centos7'
 
     type:
       - virtual
@@ -68,11 +64,11 @@
       - yardstick
 
     jobs:
-      - 'cloud-infra-verify-testfw-{os}-{type}-{stream}'
-      - 'cloud-infra-verify-testfw-{os}-{phase}-{type}-{stream}'
+      - 'cloud-infra-verify-testfw-{distro}-{type}-{stream}'
+      - 'cloud-infra-verify-testfw-{distro}-{phase}-{type}-{stream}'
 
 - job-template:
-    name: 'cloud-infra-verify-testfw-{os}-{type}-{stream}'
+    name: 'cloud-infra-verify-testfw-{distro}-{type}-{stream}'
 
     project-type: multijob
 
@@ -87,11 +83,11 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'vpod-test-{os}'
+          default: 'vpod-test-{distro}'
           description: 'Slave label to schedule this job on. These slaves have cloud infra installed on them.'
       - string:
-          name: DISTRIBUTION
-          default: '{distribution}'
+          name: DISTRO
+          default: '{distro}'
           description: 'Distribution to use for configuring target nodes (networking etc.)'
       - string:
           name: DEPLOY_TYPE
@@ -119,7 +115,7 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-verify-testfw-{os}-.*'
+            - 'cloud-infra-verify-testfw-{distro}-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -148,10 +144,10 @@
           name: functest
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-testfw-{os}-functest-{type}-{stream}'
+            - name: 'cloud-infra-verify-testfw-{distro}-functest-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
                 YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
@@ -168,10 +164,10 @@
           name: yardstick
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-testfw-{os}-yardstick-{type}-{stream}'
+            - name: 'cloud-infra-verify-testfw-{distro}-yardstick-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
@@ -187,7 +183,7 @@
               abort-all-job: true
 
 - job-template:
-    name: 'cloud-infra-verify-testfw-{os}-{phase}-{type}-{stream}'
+    name: 'cloud-infra-verify-testfw-{distro}-{phase}-{type}-{stream}'
 
     disabled: false
 
@@ -201,8 +197,8 @@
           name: PROJECT
           default: $GERRIT_PROJECT
       - string:
-          name: DISTRIBUTION
-          default: 'ubuntu18'
+          name: DISTRO
+          default: 'ubuntu1804'
           description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
       - string:
           name: DEPLOY_TYPE
diff --git a/jjb/cloud-infra/scenario-deploy.sh b/jjb/cloud-infra/scenario-deploy.sh
index 1a3ebdd..ae8c798 100644
--- a/jjb/cloud-infra/scenario-deploy.sh
+++ b/jjb/cloud-infra/scenario-deploy.sh
@@ -47,6 +47,6 @@
 
 # execute cloud engine deploy.sh script
 cd $WORKSPACE
-./engine/deploy.sh -d $INSTALLER_TYPE -s $DEPLOY_SCENARIO -p $PDF -i $IDF -c
+./engine/deploy.sh -d $INSTALLER_TYPE -o $DISTRO -s $DEPLOY_SCENARIO -p $PDF -i $IDF -c
 
 # vim: set ts=2 sw=2 expandtab: