diff --git a/playbooks/generate_readme.yml b/playbooks/generate_readme.yml
index 6751630..06250f5 100644
--- a/playbooks/generate_readme.yml
+++ b/playbooks/generate_readme.yml
@@ -4,7 +4,11 @@
   connection: local
 
   tasks:
-
     - name: install demo
-      include_role:
-        name: "../roles/generate_readme"
+      debug:
+        msg: "{{item.key}}"
+      loop: "{{ hostvars['localhost']|dict2items }}"
+      when: "item.key[:8] != 'ansible_'"
+    # - name: install demo
+    #   include_role:
+    #     name: "../roles/generate_readme"
diff --git a/playbooks/group_vars/all/01_deploy_application.yml b/playbooks/group_vars/all/01_deploy_application.yml
index ef20beb..196f231 100644
--- a/playbooks/group_vars/all/01_deploy_application.yml
+++ b/playbooks/group_vars/all/01_deploy_application.yml
@@ -1,4 +1,24 @@
 ---
+deploy_application:
+  author: "Sean Cavanaugh"
+  name: "Deploy Application (survey)"
+  description: "install yum applications on Linux with a survey"
+  job_type: "run"
+  inventory: "Workshop Inventory"
+  playbook: "playbooks/01_deploy_application.yml"
+  credential: "Workshop Credential"
+  survey_enabled: yes
+  survey_spec: "{{survey_deploy_application}}"
+  video: "https://www.youtube.com/watch?v=pU8ZgSBuEJw&list=PLdu06OJoEf2bp-PNtxPP_2n7Avkax8TED"
+  project:
+    name: "Ansible official demo project"
+    description: "prescriptive demos from Red Hat Management Buisness Unit"
+    organization: "Default"
+    scm_type: git
+    scm_url: "https://github.com/ansible/product-demos"
+  workshop_type:
+    - f5
+    - rhel
 survey_deploy_application:
   name: Deploy application survey
   description: Which application do you want to install?
diff --git a/playbooks/group_vars/all/02_patching.yml b/playbooks/group_vars/all/02_patching.yml
index ae14949..8a33b48 100644
--- a/playbooks/group_vars/all/02_patching.yml
+++ b/playbooks/group_vars/all/02_patching.yml
@@ -1,4 +1,23 @@
 ---
+patching:
+  author: "Will Tome"
+  name: "SERVER / Patching"
+  description: "patching for Linux servers"
+  job_type: "run"
+  inventory: "Workshop Inventory"
+  playbook: "playbooks/02_patching.yml"
+  credential: "Workshop Credential"
+  survey_enabled: yes
+  survey_spec: "{{survey_patching}}"
+  project:
+    name: "Ansible official demo project"
+    description: "prescriptive demos from Red Hat Management Buisness Unit"
+    organization: "Default"
+    scm_type: git
+    scm_url: "https://github.com/ansible/product-demos"
+  workshop_type:
+    - f5
+    - rhel
 survey_patching:
   name: ''
   description: ''
diff --git a/playbooks/group_vars/all/03_hardening.yml b/playbooks/group_vars/all/03_hardening.yml
index 2ff63b3..5e3bcf0 100644
--- a/playbooks/group_vars/all/03_hardening.yml
+++ b/playbooks/group_vars/all/03_hardening.yml
@@ -1,4 +1,23 @@
 ---
+hardening:
+  author: "Will Tome"
+  name: "SERVER / Hardening"
+  description: "hardening for Linux servers"
+  job_type: "run"
+  inventory: "Workshop Inventory"
+  playbook: "playbooks/03_hardening.yml"
+  credential: "Workshop Credential"
+  survey_enabled: yes
+  survey_spec: "{{survey_hardening}}"
+  project:
+    name: "Ansible official demo project"
+    description: "prescriptive demos from Red Hat Management Buisness Unit"
+    organization: "Default"
+    scm_type: git
+    scm_url: "https://github.com/ansible/product-demos"
+  workshop_type:
+    - f5
+    - rhel
 survey_hardening:
   name: ''
   description: ''
diff --git a/playbooks/group_vars/all/04_scan_facts.yml b/playbooks/group_vars/all/04_scan_facts.yml
new file mode 100644
index 0000000..cf4e98f
--- /dev/null
+++ b/playbooks/group_vars/all/04_scan_facts.yml
@@ -0,0 +1,21 @@
+---
+fact_scan:
+  author: "Will Tome"
+  name: "SERVER / Fact Scan"
+  description: "scan facts for Linux and Windows systems"
+  job_type: "run"
+  inventory: "Workshop Inventory"
+  playbook: scan_facts.yml
+  credential: "Workshop Credential"
+  survey_enabled: no
+  fact_caching_enabled: yes
+  project:
+    name: "Ansible official awx-facts-playbooks project"
+    description: "Repository containing playbooks to support fact scanning in Ansible Tower and AWX"
+    organization: "Default"
+    scm_type: git
+    scm_url: "https://github.com/ansible/awx-facts-playbooks.git"
+  workshop_type:
+    - f5
+    - rhel
+    - windows
diff --git a/playbooks/group_vars/all/05_windows_iss.yml b/playbooks/group_vars/all/05_windows_iss.yml
new file mode 100644
index 0000000..2e8ebf8
--- /dev/null
+++ b/playbooks/group_vars/all/05_windows_iss.yml
@@ -0,0 +1,18 @@
+---
+windows_iis:
+  author: "Colin McNaughton"
+  name: "Windows IIS Server"
+  description: "install webserver on Windows Server with a survey"
+  job_type: "run"
+  inventory: "Workshop Inventory"
+  playbook: "playbooks/05_windows_iis.yml"
+  credential: "Demo Credential"
+  survey_enabled: no
+  project:
+    name: "Ansible official demo project"
+    description: "prescriptive demos from Red Hat Management Buisness Unit"
+    organization: "Default"
+    scm_type: git
+    scm_url: "https://github.com/ansible/product-demos"
+  workshop_type:
+    - windows
diff --git a/playbooks/group_vars/all/10_openscap.yml b/playbooks/group_vars/all/10_openscap.yml
new file mode 100644
index 0000000..91efc4e
--- /dev/null
+++ b/playbooks/group_vars/all/10_openscap.yml
@@ -0,0 +1,19 @@
+---
+openscap:
+  author: "Sean Cavanaugh"
+  name: "Create Openscap Report"
+  description: "Create HTML report using SCAP Security Guide (SSG)"
+  job_type: "run"
+  inventory: "Workshop Inventory"
+  playbook: "playbooks/10_openscap.yml"
+  credential: "Workshop Credential"
+  survey_enabled: no
+  project:
+    name: "Ansible official demo project"
+    description: "prescriptive demos from Red Hat Management Buisness Unit"
+    organization: "Default"
+    scm_type: git
+    scm_url: "https://github.com/ansible/product-demos"
+  workshop_type:
+    - f5
+    - rhel
diff --git a/playbooks/group_vars/all/11_developer_report.yml b/playbooks/group_vars/all/11_developer_report.yml
new file mode 100644
index 0000000..5e77ee2
--- /dev/null
+++ b/playbooks/group_vars/all/11_developer_report.yml
@@ -0,0 +1,19 @@
+---
+developer_report:
+  author: "Sean Cavanaugh"
+  name: "Create Developer Report"
+  description: 'Create HTML report using <a href="https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variables-discovered-from-systems-facts">Ansible facts</a>'
+  job_type: "run"
+  inventory: "Workshop Inventory"
+  playbook: "playbooks/11_developer_report.yml"
+  credential: "Workshop Credential"
+  survey_enabled: no
+  project:
+    name: "Ansible official demo project"
+    description: "prescriptive demos from Red Hat Management Buisness Unit"
+    organization: "Default"
+    scm_type: git
+    scm_url: "https://github.com/ansible/product-demos"
+  workshop_type:
+    - f5
+    - rhel
diff --git a/playbooks/group_vars/all/all.yml b/playbooks/group_vars/all/all.yml
deleted file mode 100644
index 75e3621..0000000
--- a/playbooks/group_vars/all/all.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-demos:
-  deploy_application:
-    author: "Sean Cavanaugh"
-    name: "Deploy Application (survey)"
-    description: "install yum applications on Linux with a survey"
-    job_type: "run"
-    inventory: "Workshop Inventory"
-    playbook: "playbooks/01_deploy_application.yml"
-    credential: "Workshop Credential"
-    survey_enabled: yes
-    survey_spec: "{{survey_deploy_application}}"
-    video: "https://www.youtube.com/watch?v=pU8ZgSBuEJw&list=PLdu06OJoEf2bp-PNtxPP_2n7Avkax8TED"
-    project:
-      name: "Ansible official demo project"
-      description: "prescriptive demos from Red Hat Management Buisness Unit"
-      organization: "Default"
-      scm_type: git
-      scm_url: "https://github.com/ansible/product-demos"
-    workshop_type:
-      - f5
-      - rhel
-  patching:
-    author: "Will Tome"
-    name: "SERVER / Patching"
-    description: "patching for Linux servers"
-    job_type: "run"
-    inventory: "Workshop Inventory"
-    playbook: "playbooks/02_patching.yml"
-    credential: "Workshop Credential"
-    survey_enabled: yes
-    survey_spec: "{{survey_patching}}"
-    project:
-      name: "Ansible official demo project"
-      description: "prescriptive demos from Red Hat Management Buisness Unit"
-      organization: "Default"
-      scm_type: git
-      scm_url: "https://github.com/ansible/product-demos"
-    workshop_type:
-      - f5
-      - rhel
-  hardening:
-    author: "Will Tome"
-    name: "SERVER / Hardening"
-    description: "hardening for Linux servers"
-    job_type: "run"
-    inventory: "Workshop Inventory"
-    playbook: "playbooks/03_hardening.yml"
-    credential: "Workshop Credential"
-    survey_enabled: yes
-    survey_spec: "{{survey_hardening}}"
-    project:
-      name: "Ansible official demo project"
-      description: "prescriptive demos from Red Hat Management Buisness Unit"
-      organization: "Default"
-      scm_type: git
-      scm_url: "https://github.com/ansible/product-demos"
-    workshop_type:
-      - f5
-      - rhel
-  fact_scan:
-    author: "Will Tome"
-    name: "SERVER / Fact Scan"
-    description: "scan facts for Linux and Windows systems"
-    job_type: "run"
-    inventory: "Workshop Inventory"
-    playbook: scan_facts.yml
-    credential: "Workshop Credential"
-    survey_enabled: no
-    fact_caching_enabled: yes
-    project:
-      name: "Ansible official awx-facts-playbooks project"
-      description: "Repository containing playbooks to support fact scanning in Ansible Tower and AWX"
-      organization: "Default"
-      scm_type: git
-      scm_url: "https://github.com/ansible/awx-facts-playbooks.git"
-    workshop_type:
-      - f5
-      - rhel
-      - windows
-  windows_iis:
-    author: "Colin McNaughton"
-    name: "Windows IIS Server"
-    description: "install webserver on Windows Server with a survey"
-    job_type: "run"
-    inventory: "Workshop Inventory"
-    playbook: "playbooks/05_windows_iis.yml"
-    credential: "Demo Credential"
-    survey_enabled: no
-    project:
-      name: "Ansible official demo project"
-      description: "prescriptive demos from Red Hat Management Buisness Unit"
-      organization: "Default"
-      scm_type: git
-      scm_url: "https://github.com/ansible/product-demos"
-    workshop_type:
-      - windows
-  openscap:
-    author: "Sean Cavanaugh"
-    name: "Create Openscap Report"
-    description: "Create HTML report using SCAP Security Guide (SSG)"
-    job_type: "run"
-    inventory: "Workshop Inventory"
-    playbook: "playbooks/10_openscap.yml"
-    credential: "Workshop Credential"
-    survey_enabled: no
-    project:
-      name: "Ansible official demo project"
-      description: "prescriptive demos from Red Hat Management Buisness Unit"
-      organization: "Default"
-      scm_type: git
-      scm_url: "https://github.com/ansible/product-demos"
-    workshop_type:
-      - f5
-      - rhel
-  developer_report:
-    author: "Sean Cavanaugh"
-    name: "Create Developer Report"
-    description: 'Create HTML report using <a href="https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variables-discovered-from-systems-facts">Ansible facts</a>'
-    job_type: "run"
-    inventory: "Workshop Inventory"
-    playbook: "playbooks/11_developer_report.yml"
-    credential: "Workshop Credential"
-    survey_enabled: no
-    project:
-      name: "Ansible official demo project"
-      description: "prescriptive demos from Red Hat Management Buisness Unit"
-      organization: "Default"
-      scm_type: git
-      scm_url: "https://github.com/ansible/product-demos"
-    workshop_type:
-      - f5
-      - rhel