diff --git a/mk-k8s-mcp-oc-deploy-pipeline.groovy b/mk-k8s-mcp-oc-deploy-pipeline.groovy
index 165a50b..ec007ed 100644
--- a/mk-k8s-mcp-oc-deploy-pipeline.groovy
+++ b/mk-k8s-mcp-oc-deploy-pipeline.groovy
@@ -34,7 +34,7 @@
     def openstackEnv = "${env.WORKSPACE}/venv"
 
     if (HEAT_STACK_NAME == "") {
-	HEAT_STACK_NAME = JOB_NAME + "-b" + BUILD_NUMBER
+        HEAT_STACK_NAME = JOB_NAME + "-b" + BUILD_NUMBER
     }
 
     stage ('Download Heat templates') {
@@ -81,8 +81,10 @@
         salt.installOpenstackMcpCompute(saltMaster)
     }
 
-    stage('Trigger cleanup job') {
-        build job: 'mk-k8s-cleanup', parameters: [[$class: 'StringParameterValue', name: 'HEAT_STACK_NAME', value: HEAT_STACK_NAME]]
+    if (HEAT_STACK_DELETE == "1") {
+        stage('Trigger cleanup job') {
+            build job: 'mk-k8s-cleanup', parameters: [[$class: 'StringParameterValue', name: 'HEAT_STACK_NAME', value: HEAT_STACK_NAME]]
+        }
     }
 
 }
diff --git a/mk-k8s-simple-deploy-pipeline.groovy b/mk-k8s-simple-deploy-pipeline.groovy
index 006e63f..b624aff 100644
--- a/mk-k8s-simple-deploy-pipeline.groovy
+++ b/mk-k8s-simple-deploy-pipeline.groovy
@@ -34,7 +34,7 @@
     def openstackEnv = "${env.WORKSPACE}/venv"
 
     if (HEAT_STACK_NAME == "") {
-	HEAT_STACK_NAME = JOB_NAME + "-b" + BUILD_NUMBER
+        HEAT_STACK_NAME = JOB_NAME + "-b" + BUILD_NUMBER
     }
 
     stage ('Download Heat templates') {
@@ -81,8 +81,10 @@
     //    salt.installOpenstackMcpCompute(saltMaster)
     //}
 
-    stage('Trigger cleanup job') {
-        build job: 'mk-k8s-cleanup', parameters: [[$class: 'StringParameterValue', name: 'HEAT_STACK_NAME', value: HEAT_STACK_NAME]]
+    if (HEAT_STACK_DELETE == "1") {
+        stage('Trigger cleanup job') {
+            build job: 'mk-k8s-cleanup', parameters: [[$class: 'StringParameterValue', name: 'HEAT_STACK_NAME', value: HEAT_STACK_NAME]]
+        }
     }
 
 }