diff --git a/jjb/engine/engine-verify-jobs/engine-verify-deployment-parent-jobs.yaml b/jjb/engine/engine-verify-jobs/engine-verify-deployment-parent-jobs.yaml
index c83da30..eb7f1d4 100644
--- a/jjb/engine/engine-verify-jobs/engine-verify-deployment-parent-jobs.yaml
+++ b/jjb/engine/engine-verify-jobs/engine-verify-deployment-parent-jobs.yaml
@@ -38,10 +38,10 @@
       - offline:
           disabled: false
           execution-mode: offline-deployment
-          successful: true
-          failed: true
-          unstable: true
-          notbuilt: true
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
 
     distro:
       - ubuntu1804
diff --git a/jjb/engine/engine-verify-jobs/engine-verify-offline-deploy-test.yaml b/jjb/engine/engine-verify-jobs/engine-verify-offline-deploy-test.yaml
index 8ed343a..2c020af 100644
--- a/jjb/engine/engine-verify-jobs/engine-verify-offline-deploy-test.yaml
+++ b/jjb/engine/engine-verify-jobs/engine-verify-offline-deploy-test.yaml
@@ -77,11 +77,11 @@
           description: 'Name of heat-environment file to use.'
       - string:
           name: STACK_NAME
-          default: "nordix-cicd-verify-engine-online-{distro}-$GERRIT_CHANGE_NUMBER"
+          default: "nordix-cicd-verify-engine-offline-{distro}-$GERRIT_CHANGE_NUMBER"
           description: 'Name of the created stack'
       - string:
           name: KEYPAIR_NAME
-          default: "keypair-nordix-cicd-verify-offline-engine-{distro}-$GERRIT_CHANGE_NUMBER"
+          default: "keypair-nordix-cicd-verify-engine-offline-{distro}-$GERRIT_CHANGE_NUMBER"
           description: 'Name of the created keypair'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
diff --git a/jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml b/jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml
index 7f3b903..26bfe5d 100644
--- a/jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml
+++ b/jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml
@@ -81,7 +81,7 @@
           description: 'Name of the created stack'
       - string:
           name: KEYPAIR_NAME
-          default: "keypair-nordix-cicd-verify-online-engine-{distro}-$GERRIT_CHANGE_NUMBER"
+          default: "keypair-nordix-cicd-verify-engine-online-{distro}-$GERRIT_CHANGE_NUMBER"
           description: 'Name of the created keypair'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
diff --git a/jjb/engine/engine-verify-jobs/scripts/delete-heat-stack.sh b/jjb/engine/engine-verify-jobs/scripts/delete-heat-stack.sh
index f11c4d3..9b76d88 100755
--- a/jjb/engine/engine-verify-jobs/scripts/delete-heat-stack.sh
+++ b/jjb/engine/engine-verify-jobs/scripts/delete-heat-stack.sh
@@ -28,7 +28,7 @@
 fi
 
 if [[ "$DELETE_STACK" != "true" || "$PROVISIONER_TYPE" != "heat" ]]; then
-  echo "Info  : Skipping stack delete"
+  echo "Info  : Skipping stack delete as it is either not a cloud deployment or slack deletion is disabled!"
   exit 0
 fi