diff --git a/README.md b/README.md
index d7c4c03..cf7af5c 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,19 @@
 
 This repo currently under construction and working on a minimal viable demo for testing purposes
 
+# Table of contents
+
+   * [How to use](#how-to-use)
+      * [1. Provide login information and choose demo](#1-provide-login-information-and-choose-demo)
+      * [2. Run Ansible Playbook](#2-run-ansible-playbook)
+   * [Demo Repository](#demo-repository)
+      * [Infrastructure Demos](#infrastructure-demos)
+      * [Network Demos](#network-demos)
+      * [Security Demos](#security-demos)
+      * [Developer Demos](#developer-demos)
+   * [Contribute](#contribute)
+   * [Notes](#notes)
+
 # How to use
 
 ## 1. Provide login information and choose demo
@@ -17,6 +30,7 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
 
 # Demo Repository
 
+## Infrastructure Demos
 <table>
   <tr>
     <th>Demo Name</th>
@@ -26,23 +40,6 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
     <th>Video Walkthrough</th>
     <th>Workshop Types</th>
   </tr>
-
-  <tr>
-    <td>Create Developer Report</td>
-    <td>Sean Cavanaugh</td>
-    <td><pre>demo: developer_report</pre></td>
-    <td>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></td>
-    <td>Not available </td>
-    <td><ul><li>f5</li><li>rhel</li></ul></td>
-  </tr>
-  <tr>
-    <td>Create Openscap Report</td>
-    <td>Sean Cavanaugh</td>
-    <td><pre>demo: openscap</pre></td>
-    <td>Create HTML report using SCAP Security Guide (SSG)</td>
-    <td>Not available </td>
-    <td><ul><li>f5</li><li>rhel</li></ul></td>
-  </tr>
   <tr>
     <td>Deploy Application (survey)</td>
     <td>Sean Cavanaugh</td>
@@ -52,18 +49,10 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
     <td><ul><li>f5</li><li>rhel</li></ul></td>
   </tr>
   <tr>
-    <td>SERVER / Fact Scan</td>
+    <td>SERVER / Grant Sudo</td>
     <td>Will Tome</td>
     <td><pre>demo: fact_scan</pre></td>
-    <td>scan facts for Linux and Windows systems</td>
-    <td>Not available </td>
-    <td><ul><li>f5</li><li>rhel</li><li>windows</li></ul></td>
-  </tr>
-  <tr>
-    <td>SERVER / Hardening</td>
-    <td>Will Tome</td>
-    <td><pre>demo: hardening</pre></td>
-    <td>hardening for Linux servers</td>
+    <td>grant sudo privledges for specified time via survey</td>
     <td>Not available </td>
     <td><ul><li>f5</li><li>rhel</li></ul></td>
   </tr>
@@ -83,6 +72,19 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
     <td>Not available </td>
     <td><ul><li>windows</li></ul></td>
   </tr>
+</table>
+
+## Network Demos
+
+<table>
+  <tr>
+    <th>Demo Name</th>
+    <th>Author</th>
+    <th>install_demo.yml value</th>
+    <th>Description</th>
+    <th>Video Walkthrough</th>
+    <th>Workshop Types</th>
+  </tr>
   <tr>
     <td>WORKFLOW - F5 BIG-IP</td>
     <td>Sean Cavanaugh</td>
@@ -93,13 +95,64 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
   </tr>
 </table>
 
+## Security Demos
+
+<table>
+  <tr>
+    <th>Demo Name</th>
+    <th>Author</th>
+    <th>install_demo.yml value</th>
+    <th>Description</th>
+    <th>Video Walkthrough</th>
+    <th>Workshop Types</th>
+  </tr>
+  <tr>
+    <td>Create Openscap Report</td>
+    <td>Sean Cavanaugh</td>
+    <td><pre>demo: openscap</pre></td>
+    <td>Create HTML report using SCAP Security Guide (SSG)</td>
+    <td>Not available </td>
+    <td><ul><li>f5</li><li>rhel</li></ul></td>
+  </tr>
+  <tr>
+    <td>SERVER / Hardening</td>
+    <td>Will Tome</td>
+    <td><pre>demo: hardening</pre></td>
+    <td>hardening for Linux servers</td>
+    <td>Not available </td>
+    <td><ul><li>f5</li><li>rhel</li></ul></td>
+  </tr>
+</table>
+
+## Developer Demos
+
+<table>
+  <tr>
+    <th>Demo Name</th>
+    <th>Author</th>
+    <th>install_demo.yml value</th>
+    <th>Description</th>
+    <th>Video Walkthrough</th>
+    <th>Workshop Types</th>
+  </tr>
+  <tr>
+    <td>Create Developer Report</td>
+    <td>Sean Cavanaugh</td>
+    <td><pre>demo: developer_report</pre></td>
+    <td>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></td>
+    <td>Not available </td>
+    <td><ul><li>f5</li><li>rhel</li></ul></td>
+  </tr>
+</table>
+
+
 # Contribute
 
 please refer to the [contribute.md](docs/contribute.md) documentation included in this collection.
 
 # Notes
 
-This README.md was auto-generated by Ansible user **sean** on **2020-03-10** with Ansible version **2.9.5**
+This README.md was auto-generated by Ansible user **sean** on **2020-03-11** with Ansible version **2.9.5**
 
 To generate a README.md, execute the following command
 
diff --git a/playbooks/group_vars/all/01_deploy_application.yml b/playbooks/group_vars/all/01_deploy_application.yml
index 4114e5f..2ae84ab 100644
--- a/playbooks/group_vars/all/01_deploy_application.yml
+++ b/playbooks/group_vars/all/01_deploy_application.yml
@@ -1,6 +1,7 @@
 ---
 deploy_application:
   author: "Sean Cavanaugh"
+  category: infrastructure
   name: "Deploy Application (survey)"
   description: "install yum applications on Linux with a survey"
   job_type: "run"
diff --git a/playbooks/group_vars/all/02_patching.yml b/playbooks/group_vars/all/02_patching.yml
index c2c5a54..c1c1cd5 100644
--- a/playbooks/group_vars/all/02_patching.yml
+++ b/playbooks/group_vars/all/02_patching.yml
@@ -1,6 +1,7 @@
 ---
 patching:
   author: "Will Tome"
+  category: infrastructure
   name: "SERVER / Patching"
   description: "patching for Linux servers"
   job_type: "run"
diff --git a/playbooks/group_vars/all/03_hardening.yml b/playbooks/group_vars/all/03_hardening.yml
index ac09de9..ee9fad5 100644
--- a/playbooks/group_vars/all/03_hardening.yml
+++ b/playbooks/group_vars/all/03_hardening.yml
@@ -1,6 +1,7 @@
 ---
 hardening:
   author: "Will Tome"
+  category: security
   name: "SERVER / Hardening"
   description: "hardening for Linux servers"
   job_type: "run"
diff --git a/playbooks/group_vars/all/04_scan_facts.yml b/playbooks/group_vars/all/04_scan_facts.yml
index cf4e98f..1fbdd8a 100644
--- a/playbooks/group_vars/all/04_scan_facts.yml
+++ b/playbooks/group_vars/all/04_scan_facts.yml
@@ -1,6 +1,7 @@
 ---
 fact_scan:
   author: "Will Tome"
+  category: infrastructure
   name: "SERVER / Fact Scan"
   description: "scan facts for Linux and Windows systems"
   job_type: "run"
diff --git a/playbooks/group_vars/all/05_grant_sudo.yml b/playbooks/group_vars/all/05_grant_sudo.yml
index 8f7433d..2d468f4 100644
--- a/playbooks/group_vars/all/05_grant_sudo.yml
+++ b/playbooks/group_vars/all/05_grant_sudo.yml
@@ -1,6 +1,7 @@
 ---
 fact_scan:
   author: "Will Tome"
+  category: infrastructure
   name: "SERVER / Grant Sudo"
   description: "grant sudo privledges for specified time via survey"
   job_type: "run"
diff --git a/playbooks/group_vars/all/10_openscap.yml b/playbooks/group_vars/all/10_openscap.yml
index 91efc4e..ed154de 100644
--- a/playbooks/group_vars/all/10_openscap.yml
+++ b/playbooks/group_vars/all/10_openscap.yml
@@ -1,6 +1,7 @@
 ---
 openscap:
   author: "Sean Cavanaugh"
+  category: security
   name: "Create Openscap Report"
   description: "Create HTML report using SCAP Security Guide (SSG)"
   job_type: "run"
diff --git a/playbooks/group_vars/all/11_developer_report.yml b/playbooks/group_vars/all/11_developer_report.yml
index 5e77ee2..7e55192 100644
--- a/playbooks/group_vars/all/11_developer_report.yml
+++ b/playbooks/group_vars/all/11_developer_report.yml
@@ -1,6 +1,7 @@
 ---
 developer_report:
   author: "Sean Cavanaugh"
+  category: developer
   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"
diff --git a/playbooks/group_vars/all/20_f5_bigip_workflow.yml b/playbooks/group_vars/all/20_f5_bigip_workflow.yml
index 0c79ab3..a0b6cb7 100644
--- a/playbooks/group_vars/all/20_f5_bigip_workflow.yml
+++ b/playbooks/group_vars/all/20_f5_bigip_workflow.yml
@@ -2,6 +2,7 @@
 f5_bigip_workflow:
   workflow: true
   author: "Sean Cavanaugh"
+  category: network
   name: "WORKFLOW - F5 BIG-IP"
   description: 'Workflow for F5 BIG-IP to setup a VIP (Virtual IP) load balancer between two RHEL webservers'
   organization: "Default"
diff --git a/playbooks/group_vars/all/30_windows_iss.yml b/playbooks/group_vars/all/30_windows_iss.yml
index 5a3aaee..e1a8a27 100644
--- a/playbooks/group_vars/all/30_windows_iss.yml
+++ b/playbooks/group_vars/all/30_windows_iss.yml
@@ -1,6 +1,7 @@
 ---
 windows_iis:
   author: "Colin McNaughton"
+  category: infrastructure
   name: "Windows IIS Server"
   description: "install webserver on Windows Server with a survey"
   job_type: "run"
diff --git a/roles/generate_readme/templates/readme.j2 b/roles/generate_readme/templates/readme.j2
index 98e73be..ae3de29 100644
--- a/roles/generate_readme/templates/readme.j2
+++ b/roles/generate_readme/templates/readme.j2
@@ -2,6 +2,19 @@
 
 This repo currently under construction and working on a minimal viable demo for testing purposes
 
+# Table of contents
+
+   * [How to use](#how-to-use)
+      * [1. Provide login information and choose demo](#1-provide-login-information-and-choose-demo)
+      * [2. Run Ansible Playbook](#2-run-ansible-playbook)
+   * [Demo Repository](#demo-repository)
+      * [Infrastructure Demos](#infrastructure-demos)
+      * [Network Demos](#network-demos)
+      * [Security Demos](#security-demos)
+      * [Developer Demos](#developer-demos)
+   * [Contribute](#contribute)
+   * [Notes](#notes)
+
 # How to use
 
 ## 1. Provide login information and choose demo
@@ -17,6 +30,7 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
 
 # Demo Repository
 
+## Infrastructure Demos
 <table>
   <tr>
     <th>Demo Name</th>
@@ -26,8 +40,7 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
     <th>Video Walkthrough</th>
     <th>Workshop Types</th>
   </tr>
-
-{% for key, value in hostvars[inventory_hostname].items()|rejectattr('0', 'match', 'ansible_')|selectattr('1.name', 'defined')|sort(attribute='1.name') %}
+{% for key, value in hostvars[inventory_hostname].items()|rejectattr('0', 'match', 'ansible_')|selectattr('1.name', 'defined')|selectattr('1.category', 'match', 'infrastructure$')|sort(attribute='1.name') %}
   <tr>
     <td>{{value.name}}</td>
     <td>{{value.author}}</td>
@@ -39,6 +52,73 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
 {% endfor %}
 </table>
 
+## Network Demos
+
+<table>
+  <tr>
+    <th>Demo Name</th>
+    <th>Author</th>
+    <th>install_demo.yml value</th>
+    <th>Description</th>
+    <th>Video Walkthrough</th>
+    <th>Workshop Types</th>
+  </tr>
+{% for key, value in hostvars[inventory_hostname].items()|rejectattr('0', 'match', 'ansible_')|selectattr('1.name', 'defined')|selectattr('1.category', 'match', 'network$')|sort(attribute='1.name') %}  <tr>
+    <td>{{value.name}}</td>
+    <td>{{value.author}}</td>
+    <td><pre>demo: {{key}}</pre></td>
+    <td>{{value.description}}</td>
+    <td>{% if value.video is defined%}<a href="{{ value.video}}">Video Link</a>{% else %}Not available {% endif %}</td>
+    <td><ul>{% for workshop in value.workshop_type %}<li>{{workshop}}</li>{% endfor %}</ul></td>
+  </tr>
+{% endfor %}
+</table>
+
+## Security Demos
+
+<table>
+  <tr>
+    <th>Demo Name</th>
+    <th>Author</th>
+    <th>install_demo.yml value</th>
+    <th>Description</th>
+    <th>Video Walkthrough</th>
+    <th>Workshop Types</th>
+  </tr>
+{% for key, value in hostvars[inventory_hostname].items()|rejectattr('0', 'match', 'ansible_')|selectattr('1.name', 'defined')|selectattr('1.category', 'match', 'security$')|sort(attribute='1.name') %}  <tr>
+    <td>{{value.name}}</td>
+    <td>{{value.author}}</td>
+    <td><pre>demo: {{key}}</pre></td>
+    <td>{{value.description}}</td>
+    <td>{% if value.video is defined%}<a href="{{ value.video}}">Video Link</a>{% else %}Not available {% endif %}</td>
+    <td><ul>{% for workshop in value.workshop_type %}<li>{{workshop}}</li>{% endfor %}</ul></td>
+  </tr>
+{% endfor %}
+</table>
+
+## Developer Demos
+
+<table>
+  <tr>
+    <th>Demo Name</th>
+    <th>Author</th>
+    <th>install_demo.yml value</th>
+    <th>Description</th>
+    <th>Video Walkthrough</th>
+    <th>Workshop Types</th>
+  </tr>
+{% for key, value in hostvars[inventory_hostname].items()|rejectattr('0', 'match', 'ansible_')|selectattr('1.name', 'defined')|selectattr('1.category', 'match', 'developer$')|sort(attribute='1.name') %}  <tr>
+    <td>{{value.name}}</td>
+    <td>{{value.author}}</td>
+    <td><pre>demo: {{key}}</pre></td>
+    <td>{{value.description}}</td>
+    <td>{% if value.video is defined%}<a href="{{ value.video}}">Video Link</a>{% else %}Not available {% endif %}</td>
+    <td><ul>{% for workshop in value.workshop_type %}<li>{{workshop}}</li>{% endfor %}</ul></td>
+  </tr>
+{% endfor %}
+</table>
+
+
 # Contribute
 
 please refer to the [contribute.md](docs/contribute.md) documentation included in this collection.