diff --git a/refstack-ui/app/components/guidelines/guidelines.html b/refstack-ui/app/components/guidelines/guidelines.html
index 41e55ef1..8592da45 100644
--- a/refstack-ui/app/components/guidelines/guidelines.html
+++ b/refstack-ui/app/components/guidelines/guidelines.html
@@ -22,6 +22,7 @@
             <option value="orchestration">OpenStack with Orchestration</option>
             <option value="shared_file_system">OpenStack with Shared File System</option>
             <option value="load_balancer">OpenStack with Load Balancer</option>
+            <option value="key_manager">OpenStack with Key Manager</option>
         </select>
     </div>
 </div>
diff --git a/refstack-ui/app/components/guidelines/guidelinesController.js b/refstack-ui/app/components/guidelines/guidelinesController.js
index b92308cc..0ab6dd44 100644
--- a/refstack-ui/app/components/guidelines/guidelinesController.js
+++ b/refstack-ui/app/components/guidelines/guidelinesController.js
@@ -143,7 +143,8 @@
             if (ctrl.target === 'dns' ||
                 ctrl.target === 'orchestration' ||
                 ctrl.target === 'shared_file_system' ||
-                ctrl.target === 'load_balancer'
+                ctrl.target === 'load_balancer' ||
+                ctrl.target === 'key_manager'
                ) {
                 ctrl.gl_type = ctrl.target;
             } else {
diff --git a/refstack-ui/app/components/products/partials/testsTable.html b/refstack-ui/app/components/products/partials/testsTable.html
index d1aecf0c..e1d93a38 100644
--- a/refstack-ui/app/components/products/partials/testsTable.html
+++ b/refstack-ui/app/components/products/partials/testsTable.html
@@ -96,6 +96,7 @@
                     <option value="orchestration">OpenStack with Orchestration</option>
                     <option value="shared_file_system">OpenStack with Shared File System</option>
                     <option value="load_balancer">OpenStack with Load Balancer</option>
+                    <option value="key_manager">OpenStack with Key Manager</option>
                 </select>
                 <a ng-if="!result.targetEdit"
                    ng-click="result.targetEdit = true"
diff --git a/refstack-ui/app/components/products/productController.js b/refstack-ui/app/components/products/productController.js
index 01e0ef8f..be9dd67d 100644
--- a/refstack-ui/app/components/products/productController.js
+++ b/refstack-ui/app/components/products/productController.js
@@ -62,7 +62,8 @@
             'dns': 'OpenStack with DNS',
             'orchestration': 'OpenStack with Orchestration',
             'shared_file_system': 'OpenStack with Shared File System',
-            'load_balancer': 'OpenStack with Load Balancer'
+            'load_balancer': 'OpenStack with Load Balancer',
+            'key_manager': 'OpenStack with Key Manager'
         };
 
         // Pagination controls.
diff --git a/refstack-ui/app/components/results-report/partials/editTestModal.html b/refstack-ui/app/components/results-report/partials/editTestModal.html
index 3f60f7fa..b559508b 100644
--- a/refstack-ui/app/components/results-report/partials/editTestModal.html
+++ b/refstack-ui/app/components/results-report/partials/editTestModal.html
@@ -31,6 +31,7 @@
                 <option value="orchestration">OpenStack with Orchestration</option>
                 <option value="shared_file_system">OpenStack with Shared File System</option>
                 <option value="load_balancer">OpenStack with Load Balancer</option>
+                <option value="key_manager">OpenStack with Key Manager</option>
             </select>
             <hr>
             <strong>Associated Product:</strong>
diff --git a/refstack-ui/app/components/results-report/resultsReport.html b/refstack-ui/app/components/results-report/resultsReport.html
index 6c173478..2df4a9bb 100644
--- a/refstack-ui/app/components/results-report/resultsReport.html
+++ b/refstack-ui/app/components/results-report/resultsReport.html
@@ -89,6 +89,7 @@
                 <option value="orchestration">OpenStack with Orchestration</option>
                 <option value="shared_file_system">OpenStack with Shared File System</option>
                 <option value="load_balancer">OpenStack with Load Balancer</option>
+                <option value="key_manager">OpenStack with Key Manager</option>
             </select>
         </div>
     </div>
diff --git a/refstack-ui/app/components/results-report/resultsReportController.js b/refstack-ui/app/components/results-report/resultsReportController.js
index 0f675174..2aa6d7e1 100644
--- a/refstack-ui/app/components/results-report/resultsReportController.js
+++ b/refstack-ui/app/components/results-report/resultsReportController.js
@@ -70,7 +70,8 @@
             'dns': 'OpenStack with DNS',
             'orchestration': 'OpenStack with orchestration',
             'shared_file_system': 'OpenStack with Shared File System',
-            'load_balancer': 'OpenStack with Load Balancer'
+            'load_balancer': 'OpenStack with Load Balancer',
+            'key_manager': 'OpenStack with Key Manager'
         };
 
         /** The schema version of the currently selected guideline data. */
@@ -95,7 +96,8 @@
             if (ctrl.target === 'dns' ||
                 ctrl.target === 'orchestration' ||
                 ctrl.target === 'shared_file_system' ||
-                ctrl.target === 'load_balancer'
+                ctrl.target === 'load_balancer' ||
+                ctrl.target === 'key_manager'
                ) {
                 ctrl.gl_type = ctrl.target;
 
@@ -288,7 +290,8 @@
             if (ctrl.target === 'dns' ||
                 ctrl.target === 'orchestration' ||
                 ctrl.target === 'shared_file_system' ||
-                ctrl.target === 'load_balancer'
+                ctrl.target === 'load_balancer' ||
+                ctrl.target === 'key_manager'
                ) {
                 ctrl.gl_type = ctrl.target;
             } else {
diff --git a/refstack-ui/app/components/results/results.html b/refstack-ui/app/components/results/results.html
index d97e87e8..6445ade4 100644
--- a/refstack-ui/app/components/results/results.html
+++ b/refstack-ui/app/components/results/results.html
@@ -159,6 +159,7 @@
                         <option value="orchestration">OpenStack with Orchestration</option>
                         <option value="shared_file_system">OpenStack with Shared File System</option>
                         <option value="load_balancer">OpenStack with Load Balancer</option>
+                        <option value="key_manager">OpenStack with Key Manager</option>
                     </select>
                     <a ng-if="!result.targetEdit"
                        ng-click="result.targetEdit = true;"
diff --git a/refstack-ui/app/components/results/resultsController.js b/refstack-ui/app/components/results/resultsController.js
index ed164d06..0501ab69 100644
--- a/refstack-ui/app/components/results/resultsController.js
+++ b/refstack-ui/app/components/results/resultsController.js
@@ -45,7 +45,8 @@
         if (ctrl.target === 'dns' ||
             ctrl.target === 'orchestration' ||
             ctrl.target === 'shared_file_system' ||
-            ctrl.target === 'load_balancer'
+            ctrl.target === 'load_balancer' ||
+            ctrl.target === 'key_manager'
            ) {
             ctrl.gl_type = ctrl.target;
         } else {
@@ -60,7 +61,8 @@
             'dns': 'OpenStack with DNS',
             'orchestration': 'OpenStack with Orchestration',
             'shared_file_system': 'OpenStack with Shared File System',
-            'load_balancer': 'OpenStack with Load Balancer'
+            'load_balancer': 'OpenStack with Load Balancer',
+            'key_manager': 'OpenStack with Key Manager'
         };
 
         /** Initial page to be on. */
diff --git a/refstack/api/guidelines.py b/refstack/api/guidelines.py
index 2b5ca2bb..d81b05fc 100755
--- a/refstack/api/guidelines.py
+++ b/refstack/api/guidelines.py
@@ -167,11 +167,12 @@ class Guidelines:
                 'dns': 'OpenStack with DNS',
                 'orchestration': 'OpenStack with Orchestration',
                 'shared_file_system': 'OpenStack with Shared File System',
-                'load_balancer': 'OpenStack with Load Balancer'
+                'load_balancer': 'OpenStack with Load Balancer',
+                'key_manager': 'OpenStack with Key Manager'
 
             }
             add_ons = ['dns', 'orchestration', 'shared_file_system',
-                       'load_balancer']
+                       'load_balancer', 'key_manager']
             if target in add_ons:
                 targets = ['os_powered_' + target]
             else: