diff --git a/ansible.cfg b/ansible.cfg
index b9554b7..b9f104e 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -18,6 +18,7 @@ bin_ansible_callbacks   = True
 callback_whitelist      = ansible.posix.profile_tasks, ansible.posix.timer
 deprecation_warnings    = False
 command_warnings        = False
+#strategy                = free
 
 
 [ssh_connection]
diff --git a/collections/requirements.yml b/collections/requirements.yml
index 6629553..2d9b15a 100644
--- a/collections/requirements.yml
+++ b/collections/requirements.yml
@@ -6,7 +6,7 @@ collections:
   - name: community.crypto
 
 
-  # Main collections
+  #  Our collections
   - name: https://github.com/jchristianh-ansible-collections/pve.git
     type: git
     version: main
diff --git a/create.sh b/create.sh
index 2158bda..895584a 100755
--- a/create.sh
+++ b/create.sh
@@ -1,12 +1,15 @@
 #!/bin/bash
 
-ansible-playbook pve.yml
-read -p 'Has pve.yml completed successfully? (y/n) ' pve_complete
+ansible-playbook pve.yml -e __run_action=create
+ansible-playbook pve.yml -e __run_action=start
+ansible-playbook pve.yml -e __run_action=map
 
-if [ $pve_complete = 'y' ]
-then
-  echo 'Continuing run...'
-  ansible-playbook -i inventory/lab_hosts manage_nodes.yml --ask-vault-pass
-  ansible-playbook -i inventory/lab_hosts prometheus.yml
-  ansible-playbook -i inventory/lab_hosts grafana.yml
-fi
+#read -p 'Has pve.yml completed successfully? (y/n) ' pve_complete
+
+#if [ $pve_complete = 'y' ]
+#then
+#  echo 'Continuing run...'
+ansible-playbook -i inventory/lab_hosts manage_nodes.yml --ask-vault-pass
+ansible-playbook -i inventory/lab_hosts prometheus.yml
+ansible-playbook -i inventory/lab_hosts grafana.yml
+#fi
diff --git a/create_aap_lab.sh b/create_aap_lab.sh
new file mode 100755
index 0000000..206c7ed
--- /dev/null
+++ b/create_aap_lab.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+ansible-playbook pve.yml -e __pve_env=aap_lab -e __run_action=create
+ansible-playbook pve.yml -e __pve_env=aap_lab -e __run_action=start
+ansible-playbook pve.yml -e __pve_env=aap_lab -e __run_action=map
+
+read -p 'Has pve.yml completed successfully? (y/n) ' pve_complete
+
+if [ $pve_complete = 'y' ]
+then
+  echo 'Continuing run...'
+  ansible-playbook -i inventory/lab_hosts manage_nodes.yml --ask-vault-pass -e __pve_env=aap_lab
+  ansible-playbook -i inventory/lab_hosts prometheus.yml -e __pve_env=aap_lab
+  ansible-playbook -i inventory/lab_hosts grafana.yml -e __pve_env=aap_lab
+fi
diff --git a/create_baseos_lab.sh b/create_baseos_lab.sh
new file mode 100755
index 0000000..282a420
--- /dev/null
+++ b/create_baseos_lab.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+ansible-playbook pve.yml -e __pve_env=baseos_lab
+read -p 'Has pve.yml completed successfully? (y/n) ' pve_complete
+
+if [ $pve_complete = 'y' ]
+then
+  echo 'Continuing run...'
+  ansible-playbook -i inventory/lab_hosts manage_nodes.yml
+fi
diff --git a/create_fun_lab.sh b/create_fun_lab.sh
new file mode 100755
index 0000000..736651f
--- /dev/null
+++ b/create_fun_lab.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+ansible-playbook pve.yml -e __pve_env=fun_lab
+read -p 'Has pve.yml completed successfully? (y/n) ' pve_complete
+
+if [ $pve_complete = 'y' ]
+then
+  echo 'Continuing run...'
+  ansible-playbook -i inventory/lab_hosts manage_nodes.yml
+fi
diff --git a/create_nvme_lab.sh b/create_nvme_lab.sh
index e2a63ed..a519383 100755
--- a/create_nvme_lab.sh
+++ b/create_nvme_lab.sh
@@ -1,12 +1,15 @@
 #!/bin/bash
 
-ansible-playbook pve.yml -e __pve_env=nvme_lab
-read -p 'Has pve.yml completed successfully? (y/n) ' pve_complete
+ansible-playbook pve.yml -e __run_action=create -e __pve_env=nvme_lab
+ansible-playbook pve.yml -e __run_action=start -e __pve_env=nvme_lab
+ansible-playbook pve.yml -e __run_action=map -e __pve_env=nvme_lab
 
-if [ $pve_complete = 'y' ]
-then
-  echo 'Continuing run...'
-  ansible-playbook -i inventory/lab_hosts manage_nodes.yml --ask-vault-pass
-  ansible-playbook -i inventory/lab_hosts prometheus.yml
-  ansible-playbook -i inventory/lab_hosts grafana.yml
-fi
+#read -p 'Has pve.yml completed successfully? (y/n) ' pve_complete
+
+#if [ $pve_complete = 'y' ]
+#then
+#  echo 'Continuing run...'
+ansible-playbook -i inventory/lab_hosts manage_nodes.yml --ask-vault-pass
+ansible-playbook -i inventory/lab_hosts prometheus.yml
+ansible-playbook -i inventory/lab_hosts grafana.yml
+#fi
diff --git a/deploy_ssh_keys.yml b/deploy_ssh_keys.yml
index 1dc224e..2ff661e 100644
--- a/deploy_ssh_keys.yml
+++ b/deploy_ssh_keys.yml
@@ -17,6 +17,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/destroy.sh b/destroy.sh
index 86d7a0a..ea13fbf 100755
--- a/destroy.sh
+++ b/destroy.sh
@@ -2,3 +2,4 @@
 
 ansible-playbook -i inventory/lab_hosts manage_nodes.yml --ask-vault-pass -e '{ __rhsm_register: False }'
 ansible-playbook pve.yml -e __run_action=destroy
+rm facts.d/lab*
diff --git a/destroy_aap_lab.sh b/destroy_aap_lab.sh
new file mode 100755
index 0000000..73421ba
--- /dev/null
+++ b/destroy_aap_lab.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+ansible-playbook -i inventory/lab_hosts manage_nodes.yml --ask-vault-pass -e '{ __rhsm_register: False }'
+ansible-playbook pve.yml -e __run_action=destroy -e __pve_env=aap_lab
+rm facts.d/lab*
diff --git a/destroy_baseos_lab.sh b/destroy_baseos_lab.sh
new file mode 100755
index 0000000..1f5339f
--- /dev/null
+++ b/destroy_baseos_lab.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+ansible-playbook pve.yml -e __run_action=destroy -e __pve_env=baseos_lab
+rm facts.d/*
diff --git a/destroy_fun_lab.sh b/destroy_fun_lab.sh
new file mode 100755
index 0000000..9ea52e4
--- /dev/null
+++ b/destroy_fun_lab.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+ansible-playbook pve.yml -e __run_action=destroy -e __pve_env=fun_lab
+rm facts.d/fun*
diff --git a/destroy_nvme_lab.sh b/destroy_nvme_lab.sh
index f9c0326..ef0b2be 100755
--- a/destroy_nvme_lab.sh
+++ b/destroy_nvme_lab.sh
@@ -2,3 +2,4 @@
 
 ansible-playbook -i inventory/lab_hosts manage_nodes.yml --ask-vault-pass -e '{ __rhsm_register: False }'
 ansible-playbook pve.yml -e __run_action=destroy -e __pve_env=nvme_lab
+rm facts.d/lab*
diff --git a/inventory/lab_hosts b/inventory/lab_hosts
index f11cf57..3918ecd 100644
--- a/inventory/lab_hosts
+++ b/inventory/lab_hosts
@@ -14,21 +14,11 @@
 # KEY:                  #
 #   Node :: Group :: IP #
 #########################
-# lab-tower-1 :: aap_lab_nodes :: 10.87.6.46 :: zg-vm-dev4
-# lab-tower-2 :: aap_lab_nodes :: 10.87.6.47 :: zg-vm-dev4
-# lab-db-1 :: aap_lab_db :: 10.87.6.48 :: zg-vm-dev4
-# lab-iso-exec-1 :: aap_lab_isoexec :: 10.87.6.49 :: zg-vm-dev4
-# lab-dev-1 :: aap_lab_dev :: 10.87.6.50 :: zg-vm-dev4
-# lab-dev-2 :: aap_lab_dev :: 10.87.6.51 :: zg-vm-dev4
-# lab-dev-3 :: aap_lab_dev :: 10.87.6.52 :: zg-vm-dev4
-# lab-test-1 :: aap_lab_test :: 10.87.6.53 :: zg-vm-dev4
-# lab-test-2 :: aap_lab_test :: 10.87.6.54 :: zg-vm-dev4
-# lab-test-3 :: aap_lab_test :: 10.87.6.55 :: zg-vm-dev4
-# lab-prod-1 :: aap_lab_prod :: 10.87.6.56 :: zg-vm-dev4
-# lab-prod-2 :: aap_lab_prod :: 10.87.6.57 :: zg-vm-dev4
-# lab-prod-3 :: aap_lab_prod :: 10.87.6.58 :: zg-vm-dev4
-# lab-grafana-1 :: grafana :: 10.87.6.59 :: zg-vm-dev4
-# lab-prometheus-1 :: prometheus :: 10.87.6.60 :: zg-vm-dev4
+# lab-aap-1 :: aap_lab_nodes :: 10.87.6.118 :: zg-vm-dev4
+# lab-aap-2 :: aap_lab_nodes :: 10.87.6.119 :: zg-vm-dev4
+# lab-db-1 :: aap_lab_db :: 10.87.6.120 :: zg-vm-dev4
+# lab-iso-exec-1 :: aap_lab_isoexec :: 10.87.6.121 :: zg-vm-dev4
+# lab-iso-exec-2 :: aap_lab_isoexec :: 10.87.6.122 :: zg-vm-dev4
 
 
 
@@ -36,37 +26,27 @@
 ### HOST GROUPS ###
 ###################
 [aap_lab_nodes]
-lab-tower-1  ansible_host=10.87.6.46
-lab-tower-2  ansible_host=10.87.6.47
+lab-aap-1  ansible_host=10.87.6.118
+lab-aap-2  ansible_host=10.87.6.119
 
 [aap_lab_isoexec]
-lab-iso-exec-1  ansible_host=10.87.6.49
+lab-iso-exec-1  ansible_host=10.87.6.121
+lab-iso-exec-2  ansible_host=10.87.6.122
 
 [aap_lab_dev]
-lab-dev-1  ansible_host=10.87.6.50
-lab-dev-2  ansible_host=10.87.6.51
-lab-dev-3  ansible_host=10.87.6.52
 
 [aap_lab_test]
-lab-test-1  ansible_host=10.87.6.53
-lab-test-2  ansible_host=10.87.6.54
-lab-test-3  ansible_host=10.87.6.55
 
 [aap_lab_prod]
-lab-prod-1  ansible_host=10.87.6.56
-lab-prod-2  ansible_host=10.87.6.57
-lab-prod-3  ansible_host=10.87.6.58
 
 [aap_lab_db]
-lab-db-1  ansible_host=10.87.6.48
+lab-db-1  ansible_host=10.87.6.120
 
 [aap_lab_control_nodes]
 
 [grafana]
-lab-grafana-1  ansible_host=10.87.6.59
 
 [prometheus]
-lab-prometheus-1  ansible_host=10.87.6.60
 
 [unassigned]
 
@@ -104,4 +84,4 @@ ansible_user=root
 
 # vars for all hosts/groups
 [all:vars]
-ansible_ssh_common_args='-J root@10.1.1.86'
+ansible_ssh_common_args='-J root@10.1.1.94'
diff --git a/manage_nodes.yml b/manage_nodes.yml
index 4cb42da..d2c15f2 100644
--- a/manage_nodes.yml
+++ b/manage_nodes.yml
@@ -1,8 +1,8 @@
 ---
 - name: Provision PVE Managed Hosts
   hosts: all
-  become: yes
-  gather_facts: yes
+  become: true
+  gather_facts: false
 
 
   # --------------------------------------------- #
@@ -13,7 +13,7 @@
     __rhsm_register : yes
 
     # update environment to latest packages
-    __update_hosts  : yes
+    __update_hosts  : no
 
     # roles to include
     __include_roles:
@@ -22,16 +22,29 @@
       - jchristianh.lab_setup.deploy_etc_hosts
       - jchristianh.lab_setup.bashrc
       - jchristianh.lab_setup.rhsm        # this role includes a vault; use
-                                              # --ask-vault-pass when uncommenting
+                                          # --ask-vault-pass when uncommenting
       - jchristianh.lab_setup.base_pkgs
 #      - jchristianh.lab_setup.ansible_setup
       - jchristianh.lab_setup.node_exporter
 
 
+  # --------------------------------------------- #
+  # PRE-TASKS
+  # --------------------------------------------- #
+  pre_tasks:
+    - name: Wait for host SSH connection
+      wait_for_connection:
+        timeout : 300
+
+
   # --------------------------------------------- #
   # TASKS
   # --------------------------------------------- #
   tasks:
+    - name: Gather facts for host
+      setup:
+
+
     - name: Include required variables for environment
       include_vars:
         dir: "vars/{{ __pve_env | default('tower_lab') }}"
@@ -41,7 +54,7 @@
       set_fact:
         __include_roles: ['jchristianh.lab_setup.rhsm']
       when:
-        - not __rhsm_register|bool
+        - not __rhsm_register|default('no')|bool
 
 
     - name         : Provision environment
diff --git a/pve.yml b/pve.yml
index 4985aa5..f8a4044 100644
--- a/pve.yml
+++ b/pve.yml
@@ -22,6 +22,10 @@
     - name: Include required variables for environment
       include_vars:
         dir: "vars/{{ __pve_env | default('tower_lab') }}"
+        extensions:
+          - yml
+        ignore_files:
+          - __lab_nodes_minimal.yml
 
 
     # Generate VMIDs once at the start
@@ -38,7 +42,7 @@
         - jchristianh.pve.ssh_keygen
         - jchristianh.pve.create_vms
         - jchristianh.pve.configure_vms
-        - jchristianh.pve.start_vms
+        #- jchristianh.pve.start_vms
       loop_control:
         loop_var: lv_pve_create_roles
       when:
@@ -58,8 +62,8 @@
       loop_control:
         loop_var: lv_pve_map_env
       when:
-        - __run_action == 'map' or
-          __run_action == 'create'
+        - __run_action == 'map' # or
+          # __run_action == 'create'
 
 
     # Called either at the end of the environment creation
diff --git a/test.yml b/test.yml
new file mode 100644
index 0000000..f526baa
--- /dev/null
+++ b/test.yml
@@ -0,0 +1,38 @@
+---
+- name: Managed PVE Environment
+  hosts: localhost
+  connection: local
+  become: no
+  gather_facts: no
+
+
+  # --------------------------------------------- #
+  # INLINE VARIABLES
+  # --------------------------------------------- #
+  vars:
+    # Default action is to create and start
+    # an environment
+    #
+    # Available values:
+    # create|start|stop|shutdown|map|snapshot|rollback|destroy
+    __run_action: 'create'
+
+
+  tasks:
+    - name: Include required variables for environment
+      include_vars:
+        dir: "vars/{{ __pve_env | default('tower_lab') }}"
+        extensions:
+          - yml
+        ignore_files:
+          - __lab_nodes_minimal.yml
+
+
+    # Generate VMIDs once at the start
+    - name: Include generate_vmid role
+      include_role:
+        name: jchristianh.pve.generate_vmid
+
+
+
+...
diff --git a/vars/aap_lab/defaults.yml b/vars/aap_lab/defaults.yml
new file mode 100644
index 0000000..93e0ad8
--- /dev/null
+++ b/vars/aap_lab/defaults.yml
@@ -0,0 +1,41 @@
+---
+__project_maintainer       : Chris Hammer
+__project_maintainer_email : chris@thezengarden.net
+
+
+__pve_tld : thezengarden.net
+
+
+__pve_token    : 'PVEAPIToken=root@pam!ansible=e2356d3b-2141-4c90-866e-5ee997e301e3'
+__pve_node     : zg-vm-dev
+__pve_endpoint : "https://{{ __pve_node }}.{{ __pve_tld }}:8006/api2/json"
+
+
+__pve_template_host: zg-vm-dev
+
+
+__api_retries: 12
+__api_polling: 5
+
+
+__vm_start_delay: 3
+
+
+__vm_tmpl_id      : 23020201  # RHEL-86-03
+__vm_tmpl_id_misc : 23011702  # CentOS-9-Base
+
+
+__lab_cores_default : 2
+__lab_mem_default   : .25
+
+
+__lab_snapshot_name: aap_lab
+
+
+#__bastion_user : root
+#__bastion_host : 10.1.1.86
+
+
+...
+
+
diff --git a/vars/aap_lab/environment_packages.yml b/vars/aap_lab/environment_packages.yml
new file mode 100644
index 0000000..cbbd7a5
--- /dev/null
+++ b/vars/aap_lab/environment_packages.yml
@@ -0,0 +1,45 @@
+---
+__environment_packages:
+  redhat_7:
+    - nfs-utils
+    - tar
+    - zip
+    - git
+    - httpd-tools
+    - net-tools
+    - deltarpm
+
+  redhat_8:
+    - nfs-utils
+    - python36
+    - tar
+    - zip
+    - git
+    - httpd-tools
+    - python3-libsemanage
+    - tree
+    - wget
+    - net-tools
+
+  centos_9:
+    - nfs-utils
+    - python3
+    - tar
+    - zip
+    - git
+    - httpd-tools
+    - tree
+    - wget
+    - net-tools
+
+  debian_11:
+    - nfs-common
+    - python3
+    - tar
+    - zip
+    - git
+    - apache2-utils
+    - tree
+
+
+...
diff --git a/vars/aap_lab/inventory_vars.yml b/vars/aap_lab/inventory_vars.yml
new file mode 100644
index 0000000..c0bcac5
--- /dev/null
+++ b/vars/aap_lab/inventory_vars.yml
@@ -0,0 +1,46 @@
+---
+__default_inventory_group: unassigned
+
+
+lab_groups:
+  - aap_lab_nodes
+  - aap_lab_isoexec
+  - aap_lab_dev
+  - aap_lab_test
+  - aap_lab_prod
+  - aap_lab_db
+  - aap_lab_control_nodes
+  - grafana
+  - prometheus
+  - "{{ __default_inventory_group }}"
+
+
+lab_parents:
+  aap_lab__all__envs:
+    groups:
+      - aap_lab_dev
+      - aap_lab_test
+      - aap_lab_prod
+      - aap_lab_db
+      - "{{ __default_inventory_group }}"
+    vars:
+      - "ansible_user=root"
+
+
+  aap_lab__all__nodes:
+    groups:
+      - aap_lab_nodes
+      - aap_lab_isoexec
+      - aap_lab_dev
+      - aap_lab_test
+      - aap_lab_prod
+      - aap_lab_db
+      - aap_lab_control_nodes
+      - grafana
+      - prometheus
+      - "{{ __default_inventory_group }}"
+    vars:
+      - "ansible_user=root"
+
+
+...
diff --git a/vars/aap_lab/lab_nodes.yml b/vars/aap_lab/lab_nodes.yml
new file mode 100644
index 0000000..fe0ed6d
--- /dev/null
+++ b/vars/aap_lab/lab_nodes.yml
@@ -0,0 +1,75 @@
+---
+# PVE vmid's will start at this number
+# and increment from there...
+lab_vmid_base: 8800
+
+
+lab_nodes:
+  # RHEL 8.6 Hosts:
+  # (or default template)
+  #######################
+  - name           : lab-aap-1
+    group          : aap_lab_nodes
+    vm_host        : zg-vm-dev3
+    cores          : 4
+    mem            : 4
+
+  - name           : lab-aap-2
+    group          : aap_lab_nodes
+    vm_host        : zg-vm-dev2
+    cores          : 4
+    mem            : 4
+
+  - name           : lab-db-1
+    group          : aap_lab_db
+    vm_host        : zg-vm-dev2
+    cores          : 4
+    mem            : 4
+
+  - name           : lab-iso-exec-1
+    group          : aap_lab_isoexec
+    cores          : 8
+    mem            : 8
+
+  - name           : lab-iso-exec-2
+    group          : aap_lab_isoexec
+    vm_host        : zg-vm-dev3
+    cores          : 8
+    mem            : 8
+
+  # - name           : lab-grafana-1
+  #   vm_template_id : "{{ __vm_tmpl_id_misc }}"
+  #   group          : grafana
+  #   cores          : 4
+  #   mem            : 2
+
+  # - name           : lab-prometheus-1
+  #   vm_host        : zg-vm-dev3
+  #   vm_template_id : "{{ __vm_tmpl_id_misc }}"
+  #   group          : prometheus
+  #   cores          : 4
+  #   mem            : 2
+
+
+  # nodes for playing with
+  ########################
+  - name           : lab-dev-1
+    vm_template_id : 23011702
+
+  - name           : lab-dev-2
+    vm_template_id : 23011702
+    vm_host        : zg-vm-dev2
+
+  - name           : lab-dev-3
+    vm_template_id : 23011702
+    vm_host        : zg-vm-dev3
+
+  - name           : lab-dev-4
+    vm_template_id : 23011702
+
+  - name           : lab-dev-5
+    vm_template_id : 23011702
+    vm_host        : zg-vm-dev2
+
+
+...
diff --git a/vars/aap_lab/network.yml b/vars/aap_lab/network.yml
new file mode 100644
index 0000000..2ecb441
--- /dev/null
+++ b/vars/aap_lab/network.yml
@@ -0,0 +1,6 @@
+---
+__lab_bridge : vmbr0
+__lab_vlan   : 42
+
+
+...
diff --git a/vars/aap_lab/prometheus.yml b/vars/aap_lab/prometheus.yml
new file mode 100644
index 0000000..8b47782
--- /dev/null
+++ b/vars/aap_lab/prometheus.yml
@@ -0,0 +1,23 @@
+---
+__prometheus_global:
+  - name  : scrape_interval
+    value : 15s
+
+  - name  : evaluation_interval
+    value : 15s
+
+  - name  : scrape_timeout
+    value : 15s
+
+
+__prometheus_jobs:
+  - name: AAP2 Metrics
+    metrics_path: /api/v2/metrics/
+    scrape_interval: 5s
+    scheme: https
+    bearer_token: AkkJYv4dFq87LyWOwwCOeldACUj2Bo
+    targets:
+      - tower2.thezengarden.net
+
+
+...
diff --git a/vars/aap_lab/ssh_keypair.yml b/vars/aap_lab/ssh_keypair.yml
new file mode 100644
index 0000000..f0a3378
--- /dev/null
+++ b/vars/aap_lab/ssh_keypair.yml
@@ -0,0 +1,10 @@
+---
+__ssh_keypair_name    : id_rsa
+__ssh_keypair_dest    : "{{ playbook_dir }}/files"
+__ssh_keypair_size    : 4096
+__ssh_keypair_type    : rsa
+__ssh_authorized_file : /root/.ssh/authorized_keys
+__ssh_config_dest     : /root/.ssh/config
+
+
+...
diff --git a/vars/aap_lab/template_defaults.yml b/vars/aap_lab/template_defaults.yml
new file mode 100644
index 0000000..b1de5e0
--- /dev/null
+++ b/vars/aap_lab/template_defaults.yml
@@ -0,0 +1,26 @@
+---
+lab_template_header: Lab Environment
+
+
+lab_inv_dest   : "{{ playbook_dir }}/inventory"
+lab_inv_file   : lab_hosts
+lab_inv_tmpl   : templates/ansible_inventory.j2
+lab_inv_ver    : 1.0
+lab_inv_rev    : 220908.1055
+
+
+etc_hosts_dest : "{{ playbook_dir }}/files/hosts"
+etc_hosts_tmpl : templates/etc_hosts.j2
+etc_hosts_file : /etc/hosts
+etc_hosts_ver  : 1.0
+etc_hosts_rev  : 220818.1017
+
+
+prometheus_config_tmpl : templates/prometheus_yml.j2
+prometheus_config_file : /etc/prometheus/prometheus.yml
+prometheus_config_ver  : 1.0
+prometheus_config_rev  : 220828.2233
+
+
+...
+
diff --git a/vars/baseos_lab/defaults.yml b/vars/baseos_lab/defaults.yml
new file mode 100644
index 0000000..bbe5393
--- /dev/null
+++ b/vars/baseos_lab/defaults.yml
@@ -0,0 +1,37 @@
+---
+__project_maintainer       : Chris Hammer
+__project_maintainer_email : chris@thezengarden.net
+
+
+__pve_tld : thezengarden.net
+
+
+__pve_token    : 'PVEAPIToken=root@pam!ansible=e2356d3b-2141-4c90-866e-5ee997e301e3'
+__pve_node     : zg-vm-dev
+__pve_endpoint : "https://{{ __pve_node }}.{{ __pve_tld }}:8006/api2/json"
+
+
+__pve_template_host: zg-vm-dev
+
+
+__api_retries: 12
+__api_polling: 5
+
+
+__vm_start_delay: 0
+
+
+#__vm_tmpl_id   : 202210211  # CentOS-9-01
+__vm_tmpl_id   : 202210213  # CentOS-8-01
+
+
+__lab_cores_default : 4
+__lab_mem_default   : 4
+
+
+__lab_snapshot_name: baseos_lab
+
+
+...
+
+
diff --git a/vars/baseos_lab/environment_packages.yml b/vars/baseos_lab/environment_packages.yml
new file mode 100644
index 0000000..0c6f14e
--- /dev/null
+++ b/vars/baseos_lab/environment_packages.yml
@@ -0,0 +1,24 @@
+---
+__environment_packages:
+  centos_9:
+    - nfs-utils
+    - python3
+    - tar
+    - zip
+    - git
+    - httpd-tools
+    - tree
+    - wget
+    - net-tools
+
+  debian_11:
+    - nfs-common
+    - python3
+    - tar
+    - zip
+    - git
+    - apache2-utils
+    - tree
+
+
+...
diff --git a/vars/baseos_lab/inventory_vars.yml b/vars/baseos_lab/inventory_vars.yml
new file mode 100644
index 0000000..87302e3
--- /dev/null
+++ b/vars/baseos_lab/inventory_vars.yml
@@ -0,0 +1,17 @@
+---
+__default_inventory_group: unassigned
+
+
+lab_groups:
+  - "{{ __default_inventory_group }}"
+
+
+lab_parents:
+  baseos_lab_groups:
+    groups:
+      - "{{ __default_inventory_group }}"
+    vars:
+      - "ansible_user=root"
+
+
+...
diff --git a/vars/baseos_lab/lab_nodes.yml b/vars/baseos_lab/lab_nodes.yml
new file mode 100644
index 0000000..4176c4e
--- /dev/null
+++ b/vars/baseos_lab/lab_nodes.yml
@@ -0,0 +1,93 @@
+---
+# PVE vmid's will start at this number
+# and increment from there...
+lab_vmid_base: 6600
+
+
+lab_nodes:
+  # nodes for playing with
+  ########################
+#  - name    : baseos-centos-lab-1
+#    vm_host : zg-vm-dev
+#
+#  - name    : baseos-centos-lab-2
+#    vm_host : zg-vm-dev2
+#
+#  - name    : baseos-centos-lab-3
+#    vm_host : zg-vm-dev3
+
+
+  - name           : baseos-centos-lab-1
+    #vm_template_id : 202210211
+    vm_host        : zg-vm-dev
+    cores          : 4
+    mem            : 2
+
+  - name           : baseos-centos-lab-2
+    #vm_template_id : 202210211
+    vm_host        : zg-vm-dev2
+    cores          : 4
+    mem            : 2
+
+  - name           : baseos-centos-lab-3
+    #vm_template_id : 202210211
+    vm_host        : zg-vm-dev3
+    cores          : 4
+    mem            : 2
+
+  - name           : baseos-centos-lab-4
+    vm_template_id : 202210211
+    vm_host        : zg-vm-dev
+    cores          : 4
+    mem            : 2
+
+  - name           : baseos-centos-lab-5
+    vm_template_id : 202210211
+    vm_host        : zg-vm-dev2
+    cores          : 4
+    mem            : 2
+
+  - name           : baseos-centos-lab-6
+    vm_template_id : 202210211
+    vm_host        : zg-vm-dev3
+    cores          : 4
+    mem            : 2
+
+#  - name           : baseos-debian-lab-1
+#    vm_template_id : 202210112
+#    vm_host        : zg-vm-dev
+#    cores          : 8
+#    mem            : 2
+#
+#  - name           : baseos-debian-lab-2
+#    vm_template_id : 202210112
+#    vm_host        : zg-vm-dev2
+#    cores          : 8
+#    mem            : 2
+#
+#  - name           : baseos-debian-lab-3
+#    vm_template_id : 202210112
+#    vm_host        : zg-vm-dev
+#    cores          : 8
+#    mem            : 2
+#
+#  - name           : baseos-debian-lab-4
+#    vm_template_id : 202210112
+#    vm_host        : zg-vm-dev3
+#    cores          : 8
+#    mem            : 2
+#
+#  - name           : baseos-debian-lab-5
+#    vm_template_id : 202210112
+#    vm_host        : zg-vm-dev2
+#    cores          : 8
+#    mem            : 2
+#
+#  - name           : baseos-debian-lab-6
+#    vm_template_id : 202210112
+#    vm_host        : zg-vm-dev
+#    cores          : 8
+#    mem            : 2
+
+
+...
diff --git a/vars/baseos_lab/network.yml b/vars/baseos_lab/network.yml
new file mode 100644
index 0000000..2ecb441
--- /dev/null
+++ b/vars/baseos_lab/network.yml
@@ -0,0 +1,6 @@
+---
+__lab_bridge : vmbr0
+__lab_vlan   : 42
+
+
+...
diff --git a/vars/baseos_lab/ssh_keypair.yml b/vars/baseos_lab/ssh_keypair.yml
new file mode 100644
index 0000000..3c9b1e2
--- /dev/null
+++ b/vars/baseos_lab/ssh_keypair.yml
@@ -0,0 +1,9 @@
+---
+__ssh_keypair_name    : id_rsa
+__ssh_keypair_dest    : "{{ playbook_dir }}/files"
+__ssh_keypair_size    : 4096
+__ssh_keypair_type    : rsa
+__ssh_authorized_file : /root/.ssh/authorized_keys
+
+
+...
diff --git a/vars/baseos_lab/template_defaults.yml b/vars/baseos_lab/template_defaults.yml
new file mode 100644
index 0000000..4a3172f
--- /dev/null
+++ b/vars/baseos_lab/template_defaults.yml
@@ -0,0 +1,26 @@
+---
+lab_template_header: BaseOS Lab
+
+
+lab_inv_dest   : "{{ playbook_dir }}/inventory"
+lab_inv_file   : lab_hosts
+lab_inv_tmpl   : templates/ansible_inventory.j2
+lab_inv_ver    : 1.0
+lab_inv_rev    : 220802.954
+
+
+etc_hosts_dest : "{{ playbook_dir }}/files/hosts"
+etc_hosts_tmpl : templates/etc_hosts.j2
+etc_hosts_file : /etc/hosts
+etc_hosts_ver  : 1.0
+etc_hosts_rev  : 220818.1017
+
+
+prometheus_config_tmpl : templates/prometheus_yml.j2
+prometheus_config_file : /etc/prometheus/prometheus.yml
+prometheus_config_ver  : 1.0
+prometheus_config_rev  : 220828.2233
+
+
+...
+
diff --git a/vars/fun_lab/defaults.yml b/vars/fun_lab/defaults.yml
new file mode 100644
index 0000000..1daa66f
--- /dev/null
+++ b/vars/fun_lab/defaults.yml
@@ -0,0 +1,37 @@
+---
+__project_maintainer       : Chris Hammer
+__project_maintainer_email : chris@thezengarden.net
+
+
+__pve_tld : thezengarden.net
+
+
+__pve_token    : 'PVEAPIToken=root@pam!ansible=e2356d3b-2141-4c90-866e-5ee997e301e3'
+__pve_node     : zg-vm-dev
+__pve_endpoint : "https://{{ __pve_node }}.{{ __pve_tld }}:8006/api2/json"
+
+
+__pve_template_host: zg-vm-dev
+
+
+__api_retries: 12
+__api_polling: 5
+
+
+__vm_start_delay: 0
+
+
+#__vm_tmpl_id   : 202208113  # Debian-11-Base
+__vm_tmpl_id   : 202209011  # CentOS-9-Stream-02
+
+
+__lab_cores_default : 4
+__lab_mem_default   : 4
+
+
+__lab_snapshot_name: fun_lab
+
+
+...
+
+
diff --git a/vars/fun_lab/environment_packages.yml b/vars/fun_lab/environment_packages.yml
new file mode 100644
index 0000000..1988a94
--- /dev/null
+++ b/vars/fun_lab/environment_packages.yml
@@ -0,0 +1,44 @@
+---
+__environment_packages:
+  redhat_7:
+    - nfs-utils
+    - tar
+    - zip
+    - git
+    - httpd-tools
+    - net-tools
+
+  redhat_8:
+    - nfs-utils
+    - python36
+    - tar
+    - zip
+    - git
+    - httpd-tools
+    - python3-libsemanage
+    - tree
+    - wget
+    - net-tools
+
+  centos_9:
+    - nfs-utils
+    - python3
+    - tar
+    - zip
+    - git
+    - httpd-tools
+    - tree
+    - wget
+    - net-tools
+
+  debian_11:
+    - nfs-common
+    - python3
+    - tar
+    - zip
+    - git
+    - apache2-utils
+    - tree
+
+
+...
diff --git a/vars/fun_lab/inventory_vars.yml b/vars/fun_lab/inventory_vars.yml
new file mode 100644
index 0000000..d71eeb4
--- /dev/null
+++ b/vars/fun_lab/inventory_vars.yml
@@ -0,0 +1,17 @@
+---
+__default_inventory_group: unassigned
+
+
+lab_groups:
+  - "{{ __default_inventory_group }}"
+
+
+lab_parents:
+  fun_lab_groups:
+    groups:
+      - "{{ __default_inventory_group }}"
+    vars:
+      - "ansible_user=root"
+
+
+...
diff --git a/vars/fun_lab/lab_nodes.yml b/vars/fun_lab/lab_nodes.yml
new file mode 100644
index 0000000..e4e915f
--- /dev/null
+++ b/vars/fun_lab/lab_nodes.yml
@@ -0,0 +1,29 @@
+---
+# PVE vmid's will start at this number
+# and increment from there...
+lab_vmid_base: 5000
+
+
+lab_nodes:
+  # nodes for playing with
+  ########################
+  - name           : fun-box-1
+    vm_template_id : 202208113
+    vm_host        : zg-vm-dev
+    cores          : 24
+    mem            : 8
+
+  - name           : fun-box-2
+    vm_template_id : 202208113
+    vm_host        : zg-vm-dev2
+    cores          : 24
+    mem            : 8
+
+  - name           : fun-box-3
+    vm_template_id : 202208113
+    vm_host        : zg-vm-dev3
+    cores          : 24
+    mem            : 8
+
+
+...
diff --git a/vars/fun_lab/network.yml b/vars/fun_lab/network.yml
new file mode 100644
index 0000000..2ecb441
--- /dev/null
+++ b/vars/fun_lab/network.yml
@@ -0,0 +1,6 @@
+---
+__lab_bridge : vmbr0
+__lab_vlan   : 42
+
+
+...
diff --git a/vars/fun_lab/prometheus.yml b/vars/fun_lab/prometheus.yml
new file mode 100644
index 0000000..ec2f13e
--- /dev/null
+++ b/vars/fun_lab/prometheus.yml
@@ -0,0 +1,23 @@
+---
+__prometheus_global:
+  - name  : scrape_interval
+    value : 15s
+
+  - name  : evaluation_interval
+    value : 15s
+
+  - name  : scrape_timeout
+    value : 15s
+
+
+__prometheus_jobs:
+  - name: AAP2
+    metrics_path: /api/v2/metrics
+    scrape_interval: 5s
+    scheme: https
+    bearer_token: 2ffEZgnHoJyMKIt5fX6RTvAWQ3fIKz
+    targets:
+      - tower2.thezengarden.net
+
+
+...
diff --git a/vars/fun_lab/ssh_keypair.yml b/vars/fun_lab/ssh_keypair.yml
new file mode 100644
index 0000000..3c9b1e2
--- /dev/null
+++ b/vars/fun_lab/ssh_keypair.yml
@@ -0,0 +1,9 @@
+---
+__ssh_keypair_name    : id_rsa
+__ssh_keypair_dest    : "{{ playbook_dir }}/files"
+__ssh_keypair_size    : 4096
+__ssh_keypair_type    : rsa
+__ssh_authorized_file : /root/.ssh/authorized_keys
+
+
+...
diff --git a/vars/fun_lab/template_defaults.yml b/vars/fun_lab/template_defaults.yml
new file mode 100644
index 0000000..b23431f
--- /dev/null
+++ b/vars/fun_lab/template_defaults.yml
@@ -0,0 +1,26 @@
+---
+lab_template_header: Fun Lab
+
+
+lab_inv_dest   : "{{ playbook_dir }}/inventory"
+lab_inv_file   : lab_hosts
+lab_inv_tmpl   : templates/ansible_inventory.j2
+lab_inv_ver    : 1.0
+lab_inv_rev    : 220802.954
+
+
+etc_hosts_dest : "{{ playbook_dir }}/files/hosts"
+etc_hosts_tmpl : templates/etc_hosts.j2
+etc_hosts_file : /etc/hosts
+etc_hosts_ver  : 1.0
+etc_hosts_rev  : 220818.1017
+
+
+prometheus_config_tmpl : templates/prometheus_yml.j2
+prometheus_config_file : /etc/prometheus/prometheus.yml
+prometheus_config_ver  : 1.0
+prometheus_config_rev  : 220828.2233
+
+
+...
+
diff --git a/vars/nvme_lab/defaults.yml b/vars/nvme_lab/defaults.yml
index 4989343..3da8046 100644
--- a/vars/nvme_lab/defaults.yml
+++ b/vars/nvme_lab/defaults.yml
@@ -17,15 +17,12 @@ __pve_template_host: zg-vm-dev4
 __api_retries: 12
 __api_polling: 5
 
-#__api_retries: 1
-#__api_polling: 3
+
+__vm_start_delay: 3
 
 
-__vm_start_delay: 5
-
-
-__vm_tmpl_id   : 202209012  # RHEL-7-03
-#__vm_tmpl_id   : 202208112  # RHEL-86-02
+__vm_tmpl_id      : 23020201  # RHEL-7-03
+__vm_tmpl_id_misc : 202210111  # CentOS-9-Stream
 
 
 __lab_cores_default : 2
@@ -36,7 +33,7 @@ __lab_snapshot_name: aap_lab
 
 
 __bastion_user : root
-__bastion_host : 10.1.1.86
+__bastion_host : 10.1.1.94
 
 
 ...
diff --git a/vars/nvme_lab/environment_packages.yml b/vars/nvme_lab/environment_packages.yml
index 1988a94..cbbd7a5 100644
--- a/vars/nvme_lab/environment_packages.yml
+++ b/vars/nvme_lab/environment_packages.yml
@@ -7,6 +7,7 @@ __environment_packages:
     - git
     - httpd-tools
     - net-tools
+    - deltarpm
 
   redhat_8:
     - nfs-utils
diff --git a/vars/nvme_lab/lab_nodes.yml b/vars/nvme_lab/lab_nodes.yml
index 99f1adb..accd96a 100644
--- a/vars/nvme_lab/lab_nodes.yml
+++ b/vars/nvme_lab/lab_nodes.yml
@@ -28,15 +28,15 @@ lab_nodes:
 #    cores          : 8
 #    mem            : 16
 
-  - name           : lab-tower-1
+  - name           : lab-aap-1
     group          : aap_lab_nodes
-    cores          : 4
-    mem            : 4
+    cores          : 8
+    mem            : 8
 
-  - name           : lab-tower-2
+  - name           : lab-aap-2
     group          : aap_lab_nodes
-    cores          : 4
-    mem            : 4
+    cores          : 8
+    mem            : 8
 
   - name           : lab-db-1
     group          : aap_lab_db
@@ -45,65 +45,65 @@ lab_nodes:
 
   - name           : lab-iso-exec-1
     group          : aap_lab_isoexec
-    cores          : 8
-    mem            : 8
+    cores          : 4
+    mem            : 4
 
-#  - name           : lab-iso-exec-2
-#    group          : aap_lab_isoexec
-#    cores          : 8
-#    mem            : 8
+  - name           : lab-iso-exec-2
+    group          : aap_lab_isoexec
+    cores          : 4
+    mem            : 4
 
 
 
   # nodes for playing with
   ########################
-  - name           : lab-dev-1
-    group          : aap_lab_dev
-    vm_template_id : 202209011
-
-  - name           : lab-dev-2
-    group          : aap_lab_dev
-    vm_template_id : 202209011
-
-  - name           : lab-dev-3
-    group          : aap_lab_dev
-    vm_template_id : 202209011
-
-  - name           : lab-test-1
-    group          : aap_lab_test
-    vm_template_id : 202209011
-
-  - name           : lab-test-2
-    group          : aap_lab_test
-    vm_template_id : 202209011
-
-  - name           : lab-test-3
-    group          : aap_lab_test
-    vm_template_id : 202209011
-
-  - name           : lab-prod-1
-    group          : aap_lab_prod
-    vm_template_id : 202209011
-
-  - name           : lab-prod-2
-    group          : aap_lab_prod
-    vm_template_id : 202209011
-
-  - name           : lab-prod-3
-    group          : aap_lab_prod
-    vm_template_id : 202209011
-
-  - name           : lab-grafana-1
-    vm_template_id : 202209011
-    group          : grafana
-    cores          : 2
-    mem            : 2
-
-  - name           : lab-prometheus-1
-    vm_template_id : 202209011
-    group          : prometheus
-    cores          : 2
-    mem            : 2
+#  - name           : lab-dev-1
+#    group          : aap_lab_dev
+#    vm_template_id : "{{ __vm_tmpl_id_misc }}"
+#
+#  - name           : lab-dev-2
+#    group          : aap_lab_dev
+#    vm_template_id : "{{ __vm_tmpl_id_misc }}"
+#
+#  - name           : lab-dev-3
+#    group          : aap_lab_dev
+#    vm_template_id : "{{ __vm_tmpl_id_misc }}"
+#
+#  - name           : lab-test-1
+#    group          : aap_lab_test
+#    vm_template_id : "{{ __vm_tmpl_id_misc }}"
+#
+#  - name           : lab-test-2
+#    group          : aap_lab_test
+#    vm_template_id : "{{ __vm_tmpl_id_misc }}"
+#
+#  - name           : lab-test-3
+#    group          : aap_lab_test
+#    vm_template_id : "{{ __vm_tmpl_id_misc }}"
+#
+#  - name           : lab-prod-1
+#    group          : aap_lab_prod
+#    vm_template_id : "{{ __vm_tmpl_id_misc }}"
+#
+#  - name           : lab-prod-2
+#    group          : aap_lab_prod
+#    vm_template_id : "{{ __vm_tmpl_id_misc }}"
+#
+#  - name           : lab-prod-3
+#    group          : aap_lab_prod
+#    vm_template_id : "{{ __vm_tmpl_id_misc }}"
+#
+#  - name           : lab-grafana-1
+#    vm_template_id : "{{ __vm_tmpl_id_misc }}"
+#    group          : grafana
+#    cores          : 2
+#    mem            : 2
+#
+#  - name           : lab-prometheus-1
+#    vm_template_id : "{{ __vm_tmpl_id_misc }}"
+#    group          : prometheus
+#    cores          : 2
+#    mem            : 2
 
 
 ...
diff --git a/vars/tower_lab/__lab_nodes_minimal.yml b/vars/tower_lab/__lab_nodes_minimal.yml
new file mode 100644
index 0000000..38c5d0c
--- /dev/null
+++ b/vars/tower_lab/__lab_nodes_minimal.yml
@@ -0,0 +1,112 @@
+---
+# PVE vmid's will start at this number
+# and increment from there...
+lab_vmid_base: 2200
+
+
+lab_nodes:
+#  # RHEL 8.6 Hosts:
+#  # (or default template)
+#  #######################
+#  - name           : lab-aap-1
+#    group          : aap_lab_nodes
+#    cores          : 4
+#    mem            : 4
+#
+#  - name           : lab-db-1
+#    group          : aap_lab_db
+#    vm_host        : zg-vm-dev2
+#    cores          : 4
+#    mem            : 4
+#
+#  - name           : lab-iso-exec-1
+#    group          : aap_lab_isoexec
+#    cores          : 8
+#    mem            : 16
+#
+#  - name           : lab-iso-exec-2
+#    group          : aap_lab_isoexec
+#    vm_host        : zg-vm-dev2
+#    cores          : 8
+#    mem            : 16
+
+  - name           : lab-tower-1          # vm2
+    group          : aap_lab_nodes
+    vm_host        : zg-vm-dev3
+    cores          : 8
+    mem            : 8
+
+  - name           : lab-tower-2          # vm1
+    group          : aap_lab_nodes
+    cores          : 8
+    mem            : 8
+
+  - name           : lab-tower-db-1       # vm4
+    group          : aap_lab_db
+    vm_host        : zg-vm-dev2
+    cores          : 4
+    mem            : 4
+
+  - name           : lab-isolated-1       # vm1
+    group          : aap_lab_isoexec
+    cores          : 16
+    mem            : 16
+
+  - name           : lab-isolated-2       # vm4
+    group          : aap_lab_isoexec
+    vm_host        : zg-vm-dev2
+    cores          : 16
+    mem            : 16
+
+
+
+  # nodes for playing with
+  ########################
+#  - name           : lab-dev-1
+#    vm_template_id : 23011702
+#
+#  - name           : lab-dev-2
+#    vm_template_id : 23011702
+#    vm_host        : zg-vm-dev2
+#
+#  - name           : lab-dev-3
+#    vm_template_id : 23011702
+#    vm_host        : zg-vm-dev3
+
+#  - name           : lab-test-1
+#    vm_template_id : 202209011
+#
+#  - name           : lab-test-2
+#    vm_template_id : 202209011
+#    vm_host        : zg-vm-dev2
+#
+#  - name           : lab-test-3
+#    vm_template_id : 202209011
+#    vm_host        : zg-vm-dev3
+#
+#  - name           : lab-prod-1
+#    vm_template_id : 202209011
+#
+#  - name           : lab-prod-2
+#    vm_template_id : 202209011
+#    vm_host        : zg-vm-dev2
+#
+#  - name           : lab-prod-3
+#    vm_template_id : 202209011
+#    vm_host        : zg-vm-dev3
+
+#  - name           : lab-grafana-1
+#    vm_template_id : 202209011
+#    group          : grafana
+#    cores          : 4
+#    mem            : 4
+#
+#  - name           : lab-prometheus-1
+#    vm_host        : zg-vm-dev2
+#    vm_template_id : 202209011
+#    group          : prometheus
+#    cores          : 4
+#    mem            : 4
+
+
+...
diff --git a/vars/tower_lab/defaults.yml b/vars/tower_lab/defaults.yml
index 2c70078..13a2ac7 100644
--- a/vars/tower_lab/defaults.yml
+++ b/vars/tower_lab/defaults.yml
@@ -17,9 +17,6 @@ __pve_template_host: zg-vm-dev
 __api_retries: 12
 __api_polling: 5
 
-#__api_retries: 1
-#__api_polling: 3
-
 
 __vm_start_delay: 5
 
diff --git a/vars/tower_lab/environment_packages.yml b/vars/tower_lab/environment_packages.yml
index 1988a94..cbbd7a5 100644
--- a/vars/tower_lab/environment_packages.yml
+++ b/vars/tower_lab/environment_packages.yml
@@ -7,6 +7,7 @@ __environment_packages:
     - git
     - httpd-tools
     - net-tools
+    - deltarpm
 
   redhat_8:
     - nfs-utils
diff --git a/vars/tower_lab/lab_nodes.yml b/vars/tower_lab/lab_nodes.yml
index 4b29049..1952159 100644
--- a/vars/tower_lab/lab_nodes.yml
+++ b/vars/tower_lab/lab_nodes.yml
@@ -41,72 +41,171 @@ lab_nodes:
     cores          : 8
     mem            : 8
 
-  - name           : lab-db-1             # vm4
+  - name           : lab-tower-db-1       # vm4
     group          : aap_lab_db
     vm_host        : zg-vm-dev2
     cores          : 4
     mem            : 4
 
-  - name           : lab-iso-exec-1       # vm1
+  - name           : lab-isolated-1       # vm1
     group          : aap_lab_isoexec
     cores          : 16
     mem            : 16
 
-  - name           : lab-iso-exec-2       # vm4
+  - name           : lab-isolated-2       # vm4
     group          : aap_lab_isoexec
     vm_host        : zg-vm-dev2
     cores          : 16
     mem            : 16
 
+  - name           : lab-isolated-3       # vm1
+    group          : aap_lab_isoexec
+    vm_host        : zg-vm-dev3
+    vm_template_id : 202210121
+    cores          : 16
+    mem            : 16
 
-
-  # nodes for playing with
-  ########################
+  # Nodes for playing with:
+  #########################
   - name           : lab-dev-1
-    vm_template_id : 202209011
+    vm_template_id : 23011702
 
   - name           : lab-dev-2
-    vm_template_id : 202209011
+    vm_template_id : 23011702
     vm_host        : zg-vm-dev2
 
   - name           : lab-dev-3
-    vm_template_id : 202209011
+    vm_template_id : 23011702
     vm_host        : zg-vm-dev3
 
-  - name           : lab-test-1
-    vm_template_id : 202209011
+  - name           : lab-dev-4
+    vm_template_id : 23011702
 
-  - name           : lab-test-2
-    vm_template_id : 202209011
+  - name           : lab-dev-5
+    vm_template_id : 23011702
     vm_host        : zg-vm-dev2
 
-  - name           : lab-test-3
-    vm_template_id : 202209011
-    vm_host        : zg-vm-dev3
+  # - name           : lab-dev-6
+  #   vm_template_id : 23011702
+  #   vm_host        : zg-vm-dev3
 
-  - name           : lab-prod-1
-    vm_template_id : 202209011
+  # - name           : lab-dev-7
+  #   vm_template_id : 23011702
 
-  - name           : lab-prod-2
-    vm_template_id : 202209011
+  # - name           : lab-dev-8
+  #   vm_template_id : 23011702
+  #   vm_host        : zg-vm-dev2
+
+  # - name           : lab-dev-9
+  #   vm_template_id : 23011702
+  #   vm_host        : zg-vm-dev3
+
+  # - name           : lab-dev-10
+  #   vm_template_id : 23011702
+
+  # - name           : lab-dev-11
+  #   vm_template_id : 23011702
+  #   vm_host        : zg-vm-dev2
+
+  # - name           : lab-dev-12
+  #   vm_template_id : 23011702
+  #   vm_host        : zg-vm-dev3
+
+  # - name           : lab-dev-13
+  #   vm_template_id : 23011702
+
+  # - name           : lab-dev-14
+  #   vm_template_id : 23011702
+  #   vm_host        : zg-vm-dev2
+
+  # - name           : lab-dev-15
+  #   vm_template_id : 23011702
+  #   vm_host        : zg-vm-dev3
+
+  # - name           : lab-dev-16
+  #   vm_template_id : 23011702
+
+  # - name           : lab-dev-17
+  #   vm_template_id : 23011702
+  #   vm_host        : zg-vm-dev2
+
+  # - name           : lab-dev-18
+  #   vm_template_id : 23011702
+  #   vm_host        : zg-vm-dev3
+
+  # - name           : lab-dev-19
+  #   vm_template_id : 23011702
+
+  # - name           : lab-dev-20
+  #   vm_template_id : 23011702
+  #   vm_host        : zg-vm-dev2
+
+#  - name           : lab-dev-21
+#    vm_template_id : 23011702
+#
+#  - name           : lab-dev-22
+#    vm_template_id : 23011702
+#
+#  - name           : lab-dev-23
+#    vm_template_id : 23011702
+#
+#  - name           : lab-dev-24
+#    vm_template_id : 23011702
+#
+#  - name           : lab-dev-25
+#    vm_template_id : 23011702
+
+
+
+#  - name           : lab-dev-2
+#    vm_template_id : 23011702
+#    vm_host        : zg-vm-dev2
+#
+#  - name           : lab-dev-3
+#    vm_template_id : 23011702
+#    vm_host        : zg-vm-dev3
+
+#  - name           : lab-test-1
+#    vm_template_id : 202209011
+#
+#  - name           : lab-test-2
+#    vm_template_id : 202209011
+#    vm_host        : zg-vm-dev2
+#
+#  - name           : lab-test-3
+#    vm_template_id : 202209011
+#    vm_host        : zg-vm-dev3
+#
+#  - name           : lab-prod-1
+#    vm_template_id : 202209011
+#
+#  - name           : lab-prod-2
+#    vm_template_id : 202209011
+#    vm_host        : zg-vm-dev2
+#
+#  - name           : lab-prod-3
+#    vm_template_id : 202209011
+#    vm_host        : zg-vm-dev3
+
+#  - name           : lab-grafana-1
+#    vm_template_id : 202209011
+#    group          : grafana
+#    cores          : 4
+#    mem            : 4
+#
+#  - name           : lab-prometheus-1
+#    vm_host        : zg-vm-dev2
+#    vm_template_id : 202209011
+#    group          : prometheus
+#    cores          : 4
+#    mem            : 4
+
+
+  - name           : lab-hub-1         # vm4
     vm_host        : zg-vm-dev2
-
-  - name           : lab-prod-3
-    vm_template_id : 202209011
-    vm_host        : zg-vm-dev3
-
-  - name           : lab-grafana-1
-    vm_template_id : 202209011
-    group          : grafana
-    cores          : 4
-    mem            : 4
-
-  - name           : lab-prometheus-1
-    vm_host        : zg-vm-dev2
-    vm_template_id : 202209011
-    group          : prometheus
-    cores          : 4
-    mem            : 4
+    vm_template_id : 202210121
+    cores          : 8
+    mem            : 8
 
 
 ...
diff --git a/vars/tower_lab/ssh_keypair.yml b/vars/tower_lab/ssh_keypair.yml
index 3c9b1e2..f0a3378 100644
--- a/vars/tower_lab/ssh_keypair.yml
+++ b/vars/tower_lab/ssh_keypair.yml
@@ -4,6 +4,7 @@ __ssh_keypair_dest    : "{{ playbook_dir }}/files"
 __ssh_keypair_size    : 4096
 __ssh_keypair_type    : rsa
 __ssh_authorized_file : /root/.ssh/authorized_keys
+__ssh_config_dest     : /root/.ssh/config
 
 
 ...
diff --git a/vars/tower_lab/template_defaults.yml b/vars/tower_lab/template_defaults.yml
index 0e7ea28..b1de5e0 100644
--- a/vars/tower_lab/template_defaults.yml
+++ b/vars/tower_lab/template_defaults.yml
@@ -6,7 +6,7 @@ lab_inv_dest   : "{{ playbook_dir }}/inventory"
 lab_inv_file   : lab_hosts
 lab_inv_tmpl   : templates/ansible_inventory.j2
 lab_inv_ver    : 1.0
-lab_inv_rev    : 220802.954
+lab_inv_rev    : 220908.1055
 
 
 etc_hosts_dest : "{{ playbook_dir }}/files/hosts"