diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index 598ab01..e9134e5 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -17,8 +17,8 @@
 git = new com.mirantis.mk.Git()
 python = new com.mirantis.mk.Python()
 
-if (env.EXTRA) {
-    common.mergeEnv(env, env.EXTRA)
+if (env.EXTRA_VARIABLES_YAML) {
+    common.mergeEnv(env, env.EXTRA_VARIABLES_YAML)
 }
 
 slaveNode = env.SLAVE_NODE ?: 'docker'
diff --git a/test-system-reclass-pipeline.groovy b/test-system-reclass-pipeline.groovy
index 3a3f2f1..bafd0b3 100644
--- a/test-system-reclass-pipeline.groovy
+++ b/test-system-reclass-pipeline.groovy
@@ -1,8 +1,8 @@
 def gerrit = new com.mirantis.mk.Gerrit()
 def common = new com.mirantis.mk.Common()
 
-if (env.EXTRA) {
-    common.mergeEnv(env, env.EXTRA)
+if (env.EXTRA_VARIABLES_YAML) {
+    common.mergeEnv(env, env.EXTRA_VARIABLES_YAML)
 }
 
 def slaveNode = env.SLAVE_NODE ?: 'python&&docker'