diff --git a/internal-lab-setup-assets/startup-config/cisco1.conf b/internal-lab-setup-assets/startup-config/cisco1.conf
index 3fac5d0..6d2dcf5 100644
--- a/internal-lab-setup-assets/startup-config/cisco1.conf
+++ b/internal-lab-setup-assets/startup-config/cisco1.conf
@@ -27,7 +27,7 @@ cdp
 lldp
 !
 interface MgmtEth0/RP0/CPU0/0
-{{ if .Env.CLAB_MGMT_VRF }} vrf {{ .Env.CLAB_MGMT_VRF }}{{end}}
+{{ if .mgmt_vrf }} vrf {{ .mgmt_vrf }}{{end}}
 !
 interface Loopback0
  ip address 198.51.100.1 255.255.255.255
@@ -64,7 +64,7 @@ route-policy PERMIT_ALL
 end-policy
 !
 router static
-{{ if .Env.CLAB_MGMT_VRF }} vrf {{ .Env.CLAB_MGMT_VRF }}{{end}}
+{{ if .mgmt_vrf }} vrf {{ .mgmt_vrf }}{{end}}
 {{- if .MgmtIPv4Gateway }}
  address-family ipv4 unicast
   0.0.0.0/0 MgmtEth0/RP0/CPU0/0 {{ .MgmtIPv4Gateway }}
diff --git a/internal-lab-setup-assets/startup-config/cisco2.conf b/internal-lab-setup-assets/startup-config/cisco2.conf
index d7d6e12..58ccf6d 100644
--- a/internal-lab-setup-assets/startup-config/cisco2.conf
+++ b/internal-lab-setup-assets/startup-config/cisco2.conf
@@ -27,7 +27,7 @@ cdp
 lldp
 !
 interface MgmtEth0/RP0/CPU0/0
-{{ if .Env.CLAB_MGMT_VRF }} vrf {{ .Env.CLAB_MGMT_VRF }}{{end}}
+{{ if .mgmt_vrf }} vrf {{ .mgmt_vrf }}{{end}}
 !
 interface Loopback0
  ip address 198.51.100.2 255.255.255.255
@@ -64,7 +64,7 @@ route-policy PERMIT_ALL
 end-policy
 !
 router static
-{{ if .Env.CLAB_MGMT_VRF }} vrf {{ .Env.CLAB_MGMT_VRF }}{{end}}
+{{ if .mgmt_vrf }} vrf {{ .mgmt_vrf }}{{end}}
 {{- if .MgmtIPv4Gateway }}
  address-family ipv4 unicast
   0.0.0.0/0 MgmtEth0/RP0/CPU0/0 {{ .MgmtIPv4Gateway }}
diff --git a/internal-lab-setup-assets/startup-config/cisco3.conf b/internal-lab-setup-assets/startup-config/cisco3.conf
index 26afbaa..1006a9e 100644
--- a/internal-lab-setup-assets/startup-config/cisco3.conf
+++ b/internal-lab-setup-assets/startup-config/cisco3.conf
@@ -27,7 +27,7 @@ cdp
 lldp
 !
 interface MgmtEth0/RP0/CPU0/0
-{{ if .Env.CLAB_MGMT_VRF }} vrf {{ .Env.CLAB_MGMT_VRF }}{{end}}
+{{ if .mgmt_vrf }} vrf {{ .mgmt_vrf }}{{end}}
 !
 interface Loopback0
  ip address 198.51.100.3 255.255.255.255
@@ -54,7 +54,7 @@ route-policy PERMIT_ALL
 end-policy
 !
 router static
-{{ if .Env.CLAB_MGMT_VRF }} vrf {{ .Env.CLAB_MGMT_VRF }}{{end}}
+{{ if .mgmt_vrf }} vrf {{ .mgmt_vrf }}{{end}}
 {{- if .MgmtIPv4Gateway }}
  address-family ipv4 unicast
   0.0.0.0/0 MgmtEth0/RP0/CPU0/0 {{ .MgmtIPv4Gateway }}
diff --git a/internal-lab-setup-assets/workshop.clab.yml.j2 b/internal-lab-setup-assets/workshop.clab.yml.j2
index a7a7725..1d211c8 100644
--- a/internal-lab-setup-assets/workshop.clab.yml.j2
+++ b/internal-lab-setup-assets/workshop.clab.yml.j2
@@ -3,8 +3,7 @@
       mgmt-ipv4: 172.16.{{id}}.{{x}}
       ports:
         - 2{{"%02d" % id}}{{x}}:22
-      env:
-        CLAB_MGMT_VRF: management
+      mgmt_vrf: management
 {%- endmacro -%}
 name: automation-workshop-{{"%02d" % id}}