diff --git a/README.md b/README.md
index 579f8ec..a88ef89 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ This repository currently holds 14 demos.
     <th>Workshop Types</th>
   </tr>
   <tr>
-    <td>Deploy Application (survey)</td>
+    <td><a href="https://github.com/ansible/product-demos/blob/master/docs/infrastructure/deploy_application.md">INFRASTRUCTURE / Deploy Application</a></td>
     <td>Sean Cavanaugh</td>
     <td><pre>demo: deploy_application</pre></td>
     <td>install yum applications on Linux with a survey</td>
@@ -51,7 +51,7 @@ This repository currently holds 14 demos.
     <td><ul><li>f5</li><li>rhel</li><li>rhel_90</li></ul></td>
   </tr>
   <tr>
-    <td>SERVER / Fact Scan</td>
+    <td>INFRASTRUCTURE / Fact Scan</td>
     <td>Will Tome</td>
     <td><pre>demo: fact_scan</pre></td>
     <td>scan facts for Linux and Windows systems</td>
@@ -59,7 +59,7 @@ This repository currently holds 14 demos.
     <td><ul><li>f5</li><li>rhel</li><li>windows</li><li>rhel_90</li></ul></td>
   </tr>
   <tr>
-    <td>SERVER / Gather Debug Info</td>
+    <td>INFRASTRUCTURE / Gather Debug Info</td>
     <td>Will Tome</td>
     <td><pre>demo: debug_info</pre></td>
     <td>provide info for memory and CPU usage for specified systems</td>
@@ -67,7 +67,7 @@ This repository currently holds 14 demos.
     <td><ul><li>f5</li><li>rhel</li><li>rhel_90</li></ul></td>
   </tr>
   <tr>
-    <td>SERVER / Grant Sudo</td>
+    <td>INFRASTRUCTURE / Grant Sudo</td>
     <td>Will Tome</td>
     <td><pre>demo: grant_sudo</pre></td>
     <td>grant sudo privledges for specified time via survey</td>
@@ -75,7 +75,7 @@ This repository currently holds 14 demos.
     <td><ul><li>f5</li><li>rhel</li><li>rhel_90</li></ul></td>
   </tr>
   <tr>
-    <td>SERVER / Patching</td>
+    <td>INFRASTRUCTURE / Patching</td>
     <td>Will Tome</td>
     <td><pre>demo: patching</pre></td>
     <td>patching for Linux servers</td>
@@ -83,7 +83,7 @@ This repository currently holds 14 demos.
     <td><ul><li>f5</li><li>rhel</li><li>rhel_90</li></ul></td>
   </tr>
   <tr>
-    <td>SERVER / Red Hat Insights</td>
+    <td>INFRASTRUCTURE / Red Hat Insights</td>
     <td>Sean Cavanaugh</td>
     <td><pre>demo: insights</pre></td>
     <td>install and configure Red Hat Insights</td>
@@ -91,7 +91,7 @@ This repository currently holds 14 demos.
     <td><ul><li>f5</li><li>rhel</li><li>rhel_90</li></ul></td>
   </tr>
   <tr>
-    <td>SERVER / Security Patching</td>
+    <td>INFRASTRUCTURE / Security Patching</td>
     <td>Will Tome</td>
     <td><pre>demo: security_patching</pre></td>
     <td>upgrade all yum packages for security related except kernel</td>
@@ -99,7 +99,7 @@ This repository currently holds 14 demos.
     <td><ul><li>f5</li><li>rhel</li><li>rhel_90</li></ul></td>
   </tr>
   <tr>
-    <td>Windows IIS Server</td>
+    <td>SERVER / Windows IIS Server</td>
     <td>Colin McNaughton</td>
     <td><pre>demo: windows_iis</pre></td>
     <td>install webserver on Windows Server with a survey</td>
@@ -136,7 +136,7 @@ This repository currently holds 14 demos.
     <td><ul><li>network</li></ul></td>
   </tr>
   <tr>
-    <td>WORKFLOW - F5 BIG-IP</td>
+    <td>NETWORK / WORKFLOW - F5 BIG-IP</td>
     <td>Sean Cavanaugh</td>
     <td><pre>demo: f5_bigip_workflow</pre></td>
     <td>Workflow for F5 BIG-IP to setup a VIP (Virtual IP) load balancer between two RHEL webservers</td>
@@ -157,7 +157,7 @@ This repository currently holds 14 demos.
     <th>Workshop Types</th>
   </tr>
   <tr>
-    <td>Create Openscap Report</td>
+    <td>SECURITY / Create Openscap Report</td>
     <td>Sean Cavanaugh</td>
     <td><pre>demo: openscap</pre></td>
     <td>Create HTML report using SCAP Security Guide (SSG)</td>
@@ -165,7 +165,7 @@ This repository currently holds 14 demos.
     <td><ul><li>f5</li><li>rhel</li><li>rhel_90</li></ul></td>
   </tr>
   <tr>
-    <td>SERVER / Hardening</td>
+    <td>SECURITY / Hardening</td>
     <td>Will Tome</td>
     <td><pre>demo: hardening</pre></td>
     <td>hardening for Linux servers</td>
@@ -186,7 +186,7 @@ This repository currently holds 14 demos.
     <th>Workshop Types</th>
   </tr>
   <tr>
-    <td>Create Developer Report</td>
+    <td>DEVELOPER / 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>'
@@ -203,7 +203,7 @@ please refer to the [contribute.md](docs/contribute.md) documentation included i
 
 # Notes
 
-This README.md was auto-generated by Ansible user **sean** on **2020-05-13** with Ansible version **2.9.7**
+This README.md was auto-generated by Ansible user **sean** on **2020-05-18** with Ansible version **2.9.9**
 
 To generate a README.md, execute the following command
 
diff --git a/roles/generate_readme/templates/readme.j2 b/roles/generate_readme/templates/readme.j2
index c16ee37..99ba7a3 100644
--- a/roles/generate_readme/templates/readme.j2
+++ b/roles/generate_readme/templates/readme.j2
@@ -44,7 +44,7 @@ This repository currently holds {{hostvars[inventory_hostname].items()|rejectatt
   </tr>
 {% 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>{% if value.readme is defined%}<a href="{{ value.readme}}">{{value.name}}</a>{% else %}{{value.name}}{% endif %}</td>
     <td>{{value.author}}</td>
     <td><pre>demo: {{key}}</pre></td>
     <td>{{value.description}}</td>
diff --git a/roles/install_demo/vars/main/infrastructure/deploy_application.yml b/roles/install_demo/vars/main/infrastructure/deploy_application.yml
index fc26dfd..b87dca3 100644
--- a/roles/install_demo/vars/main/infrastructure/deploy_application.yml
+++ b/roles/install_demo/vars/main/infrastructure/deploy_application.yml
@@ -1,6 +1,7 @@
 ---
 deploy_application:
   author: "Sean Cavanaugh"
+  readme: "https://github.com/ansible/product-demos/blob/master/docs/infrastructure/deploy_application.md"
   category: infrastructure
   name: "INFRASTRUCTURE / Deploy Application"
   description: "install yum applications on Linux with a survey"