diff --git a/cicd-lab-pipeline.groovy b/cicd-lab-pipeline.groovy
index 26c2818..8726bd4 100644
--- a/cicd-lab-pipeline.groovy
+++ b/cicd-lab-pipeline.groovy
@@ -69,7 +69,11 @@
             if (HEAT_STACK_REUSE.toBoolean() == false) {
                 // Don't allow to set custom heat stack name
                 wrap([$class: 'BuildUser']) {
-                    HEAT_STACK_NAME = "${env.BUILD_USER_ID}-${JOB_NAME}-${BUILD_NUMBER}"
+                    if (env.BUILD_USER_ID) {
+                        HEAT_STACK_NAME = "${env.BUILD_USER_ID}-${JOB_NAME}-${BUILD_NUMBER}"
+                    } else {
+                        HEAT_STACK_NAME = "jenkins-${JOB_NAME}-${BUILD_NUMBER}"
+                    }
                     currentBuild.description = HEAT_STACK_NAME
                 }
             }
diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index f4a94c8..c0b58a9 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -63,7 +63,11 @@
                     if (HEAT_STACK_REUSE.toBoolean() == false) {
                         // Don't allow to set custom heat stack name
                         wrap([$class: 'BuildUser']) {
-                            HEAT_STACK_NAME = "${env.BUILD_USER_ID}-${JOB_NAME}-${BUILD_NUMBER}"
+                            if (env.BUILD_USER_ID) {
+                                HEAT_STACK_NAME = "${env.BUILD_USER_ID}-${JOB_NAME}-${BUILD_NUMBER}"
+                            } else {
+                                HEAT_STACK_NAME = "jenkins-${JOB_NAME}-${BUILD_NUMBER}"
+                            }
                             currentBuild.description = HEAT_STACK_NAME
                         }
                     }