diff --git a/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy b/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy
index ad1a6b3..7a6daaa 100644
--- a/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy
+++ b/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy
@@ -101,8 +101,9 @@
                     export REPOSITORY_SUITE=${MCP_VERSION}
                     export TEST_GROUP=test_bootstrap_salt
                     py.test -vvv -s -p no:django -p no:ipdb --junit-xml=${xml_report_name} -k \${TEST_GROUP}
-                    sleep 60  # wait for jenkins to start and IO calm down
                 """)
+                // Wait for jenkins to start and IO calm down
+                sleep(60)
 
             } catch (e) {
                   common.printMsg("Saltstack cluster deploy is failed", "purple")
diff --git a/jobs/pipelines/swarm-deploy-cicd.groovy b/jobs/pipelines/swarm-deploy-cicd.groovy
index b6f47ee..58474b9 100644
--- a/jobs/pipelines/swarm-deploy-cicd.groovy
+++ b/jobs/pipelines/swarm-deploy-cicd.groovy
@@ -47,7 +47,7 @@
 
             try {
                 // Install core and cicd
-                stage("Run Jenkins job on salt-master [deploy_openstack:drivetrain]") {
+                stage("Run Jenkins job on salt-master [deploy_openstack:${env.STACK_INSTALL}]") {
                     shared.run_job_on_day01_node(env.STACK_INSTALL, install_timeout)
                 }
 
diff --git a/jobs/pipelines/swarm-deploy-platform.groovy b/jobs/pipelines/swarm-deploy-platform.groovy
index c8dd78b..c854c73 100644
--- a/jobs/pipelines/swarm-deploy-platform.groovy
+++ b/jobs/pipelines/swarm-deploy-platform.groovy
@@ -47,7 +47,7 @@
 
             try {
                 // Install the cluster
-                stage("Run Jenkins job on CICD [deploy_openstack:platform]") {
+                stage("Run Jenkins job on CICD [deploy_openstack:${env.STACK_INSTALL}]") {
                     shared.run_job_on_cicd_nodes(env.STACK_INSTALL, install_timeout)
                 }