diff --git a/tcp_tests/templates/_heat_environments/microcloud-8116-cookied-cicd-queens-dvr-sl.sh b/tcp_tests/templates/_heat_environments/microcloud-8116-cookied-cicd-queens-dvr-sl.sh
index ed0e190..eeda42b 100755
--- a/tcp_tests/templates/_heat_environments/microcloud-8116-cookied-cicd-queens-dvr-sl.sh
+++ b/tcp_tests/templates/_heat_environments/microcloud-8116-cookied-cicd-queens-dvr-sl.sh
@@ -18,7 +18,7 @@
 export IMAGE_PATH_CFG01_DAY01=/home/jenkins/images/cfg01-day01.qcow2
 export REPOSITORY_SUITE=2019.2.0
 
-export MANAGER=heat
+export ENV_MANAGER=heat
 
 export ENV_NAME=test_env_queens
 export LAB_CONFIG_NAME=cookied-cicd-queens-dvr-sl
diff --git a/tcp_tests/templates/_heat_environments/microcloud-8116.env b/tcp_tests/templates/_heat_environments/microcloud-8116.env
index a4cd821..9570a55 100644
--- a/tcp_tests/templates/_heat_environments/microcloud-8116.env
+++ b/tcp_tests/templates/_heat_environments/microcloud-8116.env
@@ -1,8 +1,11 @@
 ---
 
 parameter_defaults:
-  flavor_medium: baremetal
-  image_ubuntu_cloud_xenial: ironic_provision_image
+  #flavor_medium: baremetal
+  flavor_medium: cfg01-virtual
+  flavor_ctl: ctl-virtual
+  image_vcp: ironic_provision_image
+  image_ubuntu_cloud_xenial: cfg01-day01
   #keypair: system-ci-keypair
   keypair: baremetal
 
@@ -14,5 +17,8 @@
   management_subnet_pool_start: 10.13.0.20
   management_subnet_pool_end: 10.13.0.60
   management_subnet_gateway_ip: 10.13.0.1
+  management_subnet_cfg01_ip: 10.13.0.15
+
+  cfg01_configdrive_image: cfg01.cookied-cicd-queens-dvr-sl-config-drive.iso
   dns_nameservers: 172.18.208.44
 ...