diff --git a/README.md b/README.md
index 6cb03e9..52aebe4 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,10 @@
This is a centralized location for all Ansible Product Demos going forward.
-| Demo Name | Description |
-|-------------------------------------------|---------------------------------------------------------------------------------------------|
-| [AAP on CodeReady](aap-on-crc/README.md) | Repository and video of how to install Ansible Automation Platform on Code Ready Containers |
-| [Infrastructure Ansible Demos](README.md) | Ansible roles to set up different demo environments |
\ No newline at end of file
+| Demo Name | Description |
+|--------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|
+| [AAP on CodeReady](aap-on-crc/README.md) | Repository and video of how to install Ansible Automation Platform on Code Ready Containers |
+| [Infrastructure Ansible Demos](old-demo-repository#infrastructure-demos) | Azure, AWS, Chocolatey, Linux and Windows Demos |
+| [Network Ansible Demos](old-demo-repository#network-demos) | Cisco IOS and F5 Demos |
+| [Infrastructure Ansible Demos](old-demo-repository#security-demos) | OSCAP and hardening demos |
+| [Infrastructure Ansible Demos](old-demo-repository#developer-demos) | Create Reports with Ansible |
diff --git a/old-demo-repository/README.md b/old-demo-repository/README.md
index 1eb2c66..1fd7bc5 100644
--- a/old-demo-repository/README.md
+++ b/old-demo-repository/README.md
@@ -34,47 +34,46 @@ This repository currently holds 23 demos.
## Infrastructure Demos
-| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough | Workshop Types |
-| --------- | ------ | ---------------------- | ----------- | ----------------- | -------------- |
-| [INFRASTRUCTURE / AWS Provision VM](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/azure_provision_vm.md") | David Rojas | `demo: aws_provision_vm` | Provision RHEL VM on AWS with Ansible Tower Survey and Environmental variables | Not available |
windows demo |
-| [INFRASTRUCTURE / Azure create a MySQL Server](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/azure_mysql_server.md") | David Rojas | `demo: azure_mysql_server` | Provision MySQL server on Azure with Ansible Tower Survey and Environmental variables | Not available | windows demo |
-| [INFRASTRUCTURE / Azure Provision VM](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/azure_provision_vm.md") | David Rojas | `demo: azure_provision_vm` | Provision RHEL VM on Azure with Ansible Tower Survey and Environmental variables | Not available | windows demo |
-| [INFRASTRUCTURE / Chocolatey App Install](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/chocolatey_app_install.md") | David Rojas | `demo: chocolatey_app_install` | Install various application packages using Chocolatey from a survey | Not available | windows demo |
-| [INFRASTRUCTURE / Chocolatey Config](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/chocolatey_config.md") | David Rojas | `demo: chocolatey_config` | Configure Chocolatey parameters that require not just enabling but adding values | Not available | windows demo |
-| [INFRASTRUCTURE / Chocolatey Features Config](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/chocolatey_features.md") | David Rojas | `demo: chocolatey_features` | Enable or disable various Chocolatey features | Not available | windows demo |
-| [INFRASTRUCTURE / Deploy Application](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/deploy_application.md") | Sean Cavanaugh | `demo: deploy_application` | install yum applications on Linux with a survey | [Video Link](https://www.youtube.com/watch?v=pU8ZgSBuEJw&list=PLdu06OJoEf2bp-PNtxPP_2n7Avkax8TED) | f5 rhel rhel_90 demo |
-| INFRASTRUCTURE / Fact Scan | Will Tome | `demo: fact_scan` | scan facts for Linux and Windows systems | Not available | f5 rhel windows rhel_90 demo |
-| INFRASTRUCTURE / Gather Debug Info | Will Tome | `demo: debug_info` | provide info for memory and CPU usage for specified systems | Not available | f5 rhel rhel_90 demo |
-| INFRASTRUCTURE / Grant Sudo | Will Tome | `demo: grant_sudo` | grant sudo privledges for specified time via survey | Not available | f5 rhel rhel_90 demo |
-| INFRASTRUCTURE / Patching | Will Tome | `demo: patching` | patching for Linux servers | Not available | f5 rhel rhel_90 demo |
-| INFRASTRUCTURE / Red Hat Insights | Sean Cavanaugh | `demo: insights` | install and configure Red Hat Insights | Not available | f5 rhel rhel_90 demo |
-| INFRASTRUCTURE / Security Patching | Will Tome | `demo: security_patching` | upgrade all yum packages for security related except kernel | Not available | f5 rhel rhel_90 demo |
-| INFRASTRUCTURE / Turn off IBM Community Grid | Sean Cavanaugh | `demo: turn_off_community_grid` | this role turns off IBM Community Grid boinc-client | Not available | f5 rhel rhel_90 demo |
-| [INFRASTRUCTURE / Windows regedit legal notice](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/windows_regedit_legal_notice.md") | David Rojas | `demo: windows_regedit_legal_notice` | using regedit modify the legal notice | Not available | windows demo |
-| SERVER / Windows IIS Server | Colin McNaughton | `demo: windows_iis` | install webserver on Windows Server with a survey | Not available | windows demo |
+| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough |
+| --------- | ------ | ---------------------- | ----------- | ----------------- |
+| [INFRASTRUCTURE / AWS Provision VM](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/azure_provision_vm.md") | David Rojas | `demo: aws_provision_vm` | Provision RHEL VM on AWS with Ansible Tower Survey and Environmental variables | Not available |
+| [INFRASTRUCTURE / Azure create a MySQL Server](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/azure_mysql_server.md") | David Rojas | `demo: azure_mysql_server` | Provision MySQL server on Azure with Ansible Tower Survey and Environmental variables | Not available |
+| [INFRASTRUCTURE / Azure Provision VM](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/azure_provision_vm.md") | David Rojas | `demo: azure_provision_vm` | Provision RHEL VM on Azure with Ansible Tower Survey and Environmental variables | Not available |
+| [INFRASTRUCTURE / Chocolatey App Install](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/chocolatey_app_install.md") | David Rojas | `demo: chocolatey_app_install` | Install various application packages using Chocolatey from a survey | Not available |
+| [INFRASTRUCTURE / Chocolatey Config](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/chocolatey_config.md") | David Rojas | `demo: chocolatey_config` | Configure Chocolatey parameters that require not just enabling but adding values | Not available |
+| [INFRASTRUCTURE / Chocolatey Features Config](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/chocolatey_features.md") | David Rojas | `demo: chocolatey_features` | Enable or disable various Chocolatey features | Not available |
+| [INFRASTRUCTURE / Deploy Application](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/deploy_application.md") | Sean Cavanaugh | `demo: deploy_application` | install yum applications on Linux with a survey | [Video Link](https://www.youtube.com/watch?v=pU8ZgSBuEJw&list=PLdu06OJoEf2bp-PNtxPP_2n7Avkax8TED) |
+| INFRASTRUCTURE / Fact Scan | Will Tome | `demo: fact_scan` | scan facts for Linux and Windows systems | Not available |
+| INFRASTRUCTURE / Gather Debug Info | Will Tome | `demo: debug_info` | provide info for memory and CPU usage for specified systems | Not available |
+| INFRASTRUCTURE / Grant Sudo | Will Tome | `demo: grant_sudo` | grant sudo privledges for specified time via survey | Not available |
+| INFRASTRUCTURE / Patching | Will Tome | `demo: patching` | patching for Linux servers | Not available |
+| INFRASTRUCTURE / Red Hat Insights | Sean Cavanaugh | `demo: insights` | install and configure Red Hat Insights | Not available |
+| INFRASTRUCTURE / Security Patching | Will Tome | `demo: security_patching` | upgrade all yum packages for security related except kernel | Not available |
+| INFRASTRUCTURE / Turn off IBM Community Grid | Sean Cavanaugh | `demo: turn_off_community_grid` | this role turns off IBM Community Grid boinc-client | Not available |
+| [INFRASTRUCTURE / Windows regedit legal notice](https://github.com/ansible/product-demos/blob/master/docs/infrastructure/windows_regedit_legal_notice.md") | David Rojas | `demo: windows_regedit_legal_notice` | using regedit modify the legal notice | Not available |
+| SERVER / Windows IIS Server | Colin McNaughton | `demo: windows_iis` | install webserver on Windows Server with a survey | Not available |
## Network Demos
-| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough | Workshop Types |
-| --------- | ------ | ---------------------- | ----------- | ----------------- | -------------- |
-| Cisco IOS logging config audit/remediation | Colin McCarthy | `demo: configlet_logging` | Cisco IOS logging config audit/remediation | Not available | network demo |
-| Cisco IOS ntp config audit/remediation | Colin McCarthy | `demo: configlet_ntp` | Cisco IOS ntp config audit/remediation | Not available | network demo |
-| Cisco IOS VTY ACL config audit/remediation | George James | `demo: configlet_vtyacl` | Cisco IOS VTY ACL config audit/remediation | Not available | network demo |
-| NETWORK / WORKFLOW - F5 BIG-IP | Sean Cavanaugh | `demo: f5_bigip_workflow` | Workflow for F5 BIG-IP to setup a VIP (Virtual IP) load balancer between two RHEL webservers | Not available | f5 demo |
+| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough |
+| --------- | ------ | ---------------------- | ----------- | ----------------- |
+| Cisco IOS logging config audit/remediation | Colin McCarthy | `demo: configlet_logging` | Cisco IOS logging config audit/remediation | Not available |
+| Cisco IOS ntp config audit/remediation | Colin McCarthy | `demo: configlet_ntp` | Cisco IOS ntp config audit/remediation | Not available |
+| Cisco IOS VTY ACL config audit/remediation | George James | `demo: configlet_vtyacl` | Cisco IOS VTY ACL config audit/remediation | Not available |
+| NETWORK / WORKFLOW - F5 BIG-IP | Sean Cavanaugh | `demo: f5_bigip_workflow` | Workflow for F5 BIG-IP to setup a VIP (Virtual IP) load balancer between two RHEL webservers | Not available |
## Security Demos
-| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough | Workshop Types |
-| --------- | ------ | ---------------------- | ----------- | ----------------- | -------------- |
-| SECURITY / Create Openscap Report | Sean Cavanaugh | `demo: openscap` | Create HTML report using SCAP Security Guide (SSG) | Not available | f5 rhel rhel_90 demo |
-| SECURITY / Hardening | Will Tome | `demo: hardening` | hardening for Linux servers | Not available | f5 rhel rhel_90 demo |
+| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough |
+| --------- | ------ | ---------------------- | ----------- | ----------------- |
+| SECURITY / Create Openscap Report | Sean Cavanaugh | `demo: openscap` | Create HTML report using SCAP Security Guide (SSG) | Not available |
+| SECURITY / Hardening | Will Tome | `demo: hardening` | hardening for Linux servers | Not available |
## Developer Demos
-| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough | Workshop Types |
-| --------- | ------ | ---------------------- | ----------- | ----------------- | -------------- |
-| DEVELOPER / Create Developer Report | Sean Cavanaugh | `demo: developer_report` |Create HTML report using [Ansible facts](https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variables-discovered-from-systems-facts)
-| Not available | f5 rhel rhel_90 demo |
+| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough |
+| --------- | ------ | ---------------------- | ----------- | ----------------- |
+| DEVELOPER / Create Developer Report | Sean Cavanaugh | `demo: developer_report` | Create HTML report using [Ansible facts](https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variables-discovered-from-systems-facts) | Not available |
## Contribute
diff --git a/old-demo-repository/roles/generate_readme/templates/readme.j2 b/old-demo-repository/roles/generate_readme/templates/readme.j2
index bc275a0..5cbbce2 100644
--- a/old-demo-repository/roles/generate_readme/templates/readme.j2
+++ b/old-demo-repository/roles/generate_readme/templates/readme.j2
@@ -34,30 +34,30 @@ This repository currently holds {{job_template_definitions.items()|sort(attribut
## Infrastructure Demos
-| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough | Workshop Types |
-| --------- | ------ | ---------------------- | ----------- | ----------------- | -------------- |
-{% for key, value in job_template_definitions.items()|selectattr('1.category', 'match', 'infrastructure$')|sort(attribute='1.name') %}| {% if value.readme is defined%}[{{value.name}}]({{ value.readme}}"){% else %}{{value.name}}{% endif %} | {{value.author}} | `demo: {{key}}` | {{value.description}} | {% if value.video is defined%}[Video Link]({{ value.video}}){% else %}Not available {% endif %} | {% for workshop in value.workshop_type %} {{workshop}}{% endfor %} |
+| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough |
+| --------- | ------ | ---------------------- | ----------- | ----------------- |
+{% for key, value in job_template_definitions.items()|selectattr('1.category', 'match', 'infrastructure$')|sort(attribute='1.name') %}| {% if value.readme is defined%}[{{value.name}}]({{ value.readme}}"){% else %}{{value.name}}{% endif %} | {{value.author}} | `demo: {{key}}` | {{value.description}} | {% if value.video is defined%}[Video Link]({{ value.video}}){% else %}Not available {% endif %} |
{% endfor %}
## Network Demos
-| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough | Workshop Types |
-| --------- | ------ | ---------------------- | ----------- | ----------------- | -------------- |
-{% for key, value in job_template_definitions.items()|selectattr('1.category', 'match', 'network$')|sort(attribute='1.name') %}| {% if value.readme is defined%}[{{value.name}}]({{ value.readme}}"){% else %}{{value.name}}{% endif %} | {{value.author}} | `demo: {{key}}` | {{value.description}} | {% if value.video is defined%}[Video Link]({{ value.video}}){% else %}Not available {% endif %} | {% for workshop in value.workshop_type %} {{workshop}}{% endfor %} |
+| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough |
+| --------- | ------ | ---------------------- | ----------- | ----------------- |
+{% for key, value in job_template_definitions.items()|selectattr('1.category', 'match', 'network$')|sort(attribute='1.name') %}| {% if value.readme is defined%}[{{value.name}}]({{ value.readme}}"){% else %}{{value.name}}{% endif %} | {{value.author}} | `demo: {{key}}` | {{value.description}} | {% if value.video is defined%}[Video Link]({{ value.video}}){% else %}Not available {% endif %} |
{% endfor %}
## Security Demos
-| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough | Workshop Types |
-| --------- | ------ | ---------------------- | ----------- | ----------------- | -------------- |
-{% for key, value in job_template_definitions.items()|selectattr('1.category', 'match', 'security$')|sort(attribute='1.name') %}| {% if value.readme is defined%}[{{value.name}}]({{ value.readme}}"){% else %}{{value.name}}{% endif %} | {{value.author}} | `demo: {{key}}` | {{value.description}} | {% if value.video is defined%}[Video Link]({{ value.video}}){% else %}Not available {% endif %} | {% for workshop in value.workshop_type %} {{workshop}}{% endfor %} |
+| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough |
+| --------- | ------ | ---------------------- | ----------- | ----------------- |
+{% for key, value in job_template_definitions.items()|selectattr('1.category', 'match', 'security$')|sort(attribute='1.name') %}| {% if value.readme is defined%}[{{value.name}}]({{ value.readme}}"){% else %}{{value.name}}{% endif %} | {{value.author}} | `demo: {{key}}` | {{value.description}} | {% if value.video is defined%}[Video Link]({{ value.video}}){% else %}Not available {% endif %} |
{% endfor %}
## Developer Demos
-| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough | Workshop Types |
-| --------- | ------ | ---------------------- | ----------- | ----------------- | -------------- |
-{% for key, value in job_template_definitions.items()|selectattr('1.category', 'match', 'developer$')|sort(attribute='1.name') %}| {% if value.readme is defined%}[{{value.name}}]({{ value.readme}}"){% else %}{{value.name}}{% endif %} | {{value.author}} | `demo: {{key}}` |{{value.description}}| {% if value.video is defined%}[Video Link]({{ value.video}}){% else %}Not available {% endif %} | {% for workshop in value.workshop_type %} {{workshop}}{% endfor %} |
+| Demo Name | Author | install_demo.yml value | Description | Video Walkthrough |
+| --------- | ------ | ---------------------- | ----------- | ----------------- |
+{% for key, value in job_template_definitions.items()|selectattr('1.category', 'match', 'developer$')|sort(attribute='1.name') %}| {% if value.readme is defined%}[{{value.name}}]({{ value.readme}}"){% else %}{{value.name}}{% endif %} | {{value.author}} | `demo: {{key}}` | {{value.description}} | {% if value.video is defined%}[Video Link]({{ value.video}}){% else %}Not available {% endif %} |
{% endfor %}
## Contribute
diff --git a/old-demo-repository/roles/install_demo/vars/main/developer/developer_report.yml b/old-demo-repository/roles/install_demo/vars/main/developer/developer_report.yml
index a2ae712..8b887c1 100644
--- a/old-demo-repository/roles/install_demo/vars/main/developer/developer_report.yml
+++ b/old-demo-repository/roles/install_demo/vars/main/developer/developer_report.yml
@@ -3,9 +3,7 @@ developer_report:
author: "Sean Cavanaugh"
category: developer
name: "DEVELOPER / Create Developer Report"
- description: >
- Create HTML report using
- [Ansible facts](https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variables-discovered-from-systems-facts)
+ description: Create HTML report using [Ansible facts](https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variables-discovered-from-systems-facts)
job_type: "run"
inventory: "Workshop Inventory"
playbook: "playbooks/developer/developer_report.yml"