diff --git a/mk-k8s-mcp-oc-deploy-pipeline.groovy b/mk-k8s-mcp-oc-deploy-pipeline.groovy
index 109b17b..9640594 100644
--- a/mk-k8s-mcp-oc-deploy-pipeline.groovy
+++ b/mk-k8s-mcp-oc-deploy-pipeline.groovy
@@ -33,6 +33,10 @@
     def openstackVersion = OPENSTACK_API_CLIENT ? OPENSTACK_API_CLIENT : "liberty"
     def openstackEnv = "${env.WORKSPACE}/venv"
 
+    if (HEAT_STACK_NAME == "") {
+	HEAT_STACK_NAME = JOB_NAME + "-b" + BUILD_NUMBER
+    }
+
     stage ('Download Heat templates') {
         git.checkoutGitRepository('template', HEAT_TEMPLATE_URL, HEAT_TEMPLATE_BRANCH, HEAT_TEMPLATE_CREDENTIALS)
     }
diff --git a/mk-k8s-simple-deploy-pipeline.groovy b/mk-k8s-simple-deploy-pipeline.groovy
index 84897cb..641283d 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 = "mk-k8s-simple-b" + BUILD_NUMBER
+	HEAT_STACK_NAME = JOB_NAME + "-b" + BUILD_NUMBER
     }
 
     stage ('Download Heat templates') {