diff --git a/manage_nodes.yml b/manage_nodes.yml
index 367c6e5..4cb42da 100644
--- a/manage_nodes.yml
+++ b/manage_nodes.yml
@@ -5,20 +5,6 @@
   gather_facts: yes
 
 
-  # --------------------------------------------- #
-  # INCLUDED VARIABLES
-  # --------------------------------------------- #
-  vars_files:
-    - "vars/{{ __pve_env | default('tower_lab') }}/defaults.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/environment_packages.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/inventory_vars.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/lab_nodes.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/network.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/prometheus.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/ssh_keypair.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/template_defaults.yml"
-
-
   # --------------------------------------------- #
   # INLINE VARIABLES
   # --------------------------------------------- #
@@ -46,6 +32,11 @@
   # TASKS
   # --------------------------------------------- #
   tasks:
+    - name: Include required variables for environment
+      include_vars:
+        dir: "vars/{{ __pve_env | default('tower_lab') }}"
+
+
     - name: Include only RHSM role if unregistering
       set_fact:
         __include_roles: ['jchristianh.lab_setup.rhsm']
@@ -53,9 +44,6 @@
         - not __rhsm_register|bool
 
 
-# we can use set_fact with __include_roles; append rhsm if __rhsm_register == yes
-
-
     - name         : Provision environment
       include_role :
         name       : "{{ lv_provision }}"
diff --git a/prometheus.yml b/prometheus.yml
index d1bcd6a..e7d5754 100644
--- a/prometheus.yml
+++ b/prometheus.yml
@@ -5,20 +5,6 @@
   gather_facts: yes
 
 
-  # --------------------------------------------- #
-  # INCLUDED VARIABLES
-  # --------------------------------------------- #
-  vars_files:
-    - "vars/{{ __pve_env | default('tower_lab') }}/defaults.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/environment_packages.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/inventory_vars.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/lab_nodes.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/network.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/prometheus.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/ssh_keypair.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/template_defaults.yml"
-
-
   # --------------------------------------------- #
   # INLINE VARS
   # --------------------------------------------- #
@@ -32,6 +18,11 @@
   # TASKS
   # --------------------------------------------- #
   tasks:
+    - name: Include required variables for environment
+      include_vars:
+        dir: "vars/{{ __pve_env | default('tower_lab') }}"
+
+
     - name         : Provision environment
       include_role :
         name       : "{{ lv_provision }}"
diff --git a/pve.yml b/pve.yml
index 56e1096..4985aa5 100644
--- a/pve.yml
+++ b/pve.yml
@@ -6,17 +6,9 @@
   gather_facts: no
 
 
-  vars_files:
-    - "vars/{{ __pve_env | default('tower_lab') }}/defaults.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/environment_packages.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/inventory_vars.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/lab_nodes.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/network.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/prometheus.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/ssh_keypair.yml"
-    - "vars/{{ __pve_env | default('tower_lab') }}/template_defaults.yml"
-
-
+  # --------------------------------------------- #
+  # INLINE VARIABLES
+  # --------------------------------------------- #
   vars:
     # Default action is to create and start
     # an environment
@@ -27,6 +19,11 @@
 
 
   tasks:
+    - name: Include required variables for environment
+      include_vars:
+        dir: "vars/{{ __pve_env | default('tower_lab') }}"
+
+
     # Generate VMIDs once at the start
     - name: Include generate_vmid role
       include_role: