diff --git a/jobs/pipelines/deploy-cicd-and-run-tests.groovy b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
index 5106d80..a611a1a 100644
--- a/jobs/pipelines/deploy-cicd-and-run-tests.groovy
+++ b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
@@ -17,7 +17,7 @@
     node_with_reports = "${NODE_NAME}"
     make_snapshot_stages = "${env.MAKE_SNAPSHOT_STAGES}" != "false" ? true : false
 } else if (env_manager == 'heat') {
-    jenkins_slave_node_name = "openstack_slave_${JOB_NAME}"
+    jenkins_slave_node_name = "openstack_slave_${env.ENV_NAME}"
     make_snapshot_stages = false
     node_with_reports = jenkins_slave_node_name
 }
@@ -222,11 +222,11 @@
             }
             def deploy = build job: "${upgrade_job}",
                 parameters: [
-                    string(name: 'PARENT_NODE_NAME', value: "openstack_slave_${env.LAB_CONFIG_NAME}"),
+                    string(name: 'PARENT_NODE_NAME', value: "openstack_slave_${env.ENV_NAME}"),
                     string(name: 'TCP_QA_REFS', value: env.TCP_QA_REFS),
                     string(name: 'PASSED_STEPS', value: steps),
                     string(name: 'TEMPEST_TEST_SUITE_NAME', value: env.TEMPEST_TEST_SUITE_NAME),
-                    string(name: 'NODE', value: "openstack_slave_${env.LAB_CONFIG_NAME}")
+                    string(name: 'NODE', value: "openstack_slave_${env.ENV_NAME}")
                 ],
                 wait: false,
                 propagate: false