diff --git a/refstack-ui/app/components/guidelines/guidelines.html b/refstack-ui/app/components/guidelines/guidelines.html
index d04a2185..797a636e 100644
--- a/refstack-ui/app/components/guidelines/guidelines.html
+++ b/refstack-ui/app/components/guidelines/guidelines.html
@@ -20,6 +20,7 @@
             <option value="object">OpenStack Powered Object Storage</option>
             <option value="dns">OpenStack with DNS</option>
             <option value="orchestration">OpenStack with Orchestration</option>
+            <option value="shared_file_system">OpenStack with Shared File System</option>
         </select>
     </div>
 </div>
diff --git a/refstack-ui/app/components/guidelines/guidelinesController.js b/refstack-ui/app/components/guidelines/guidelinesController.js
index 1bcda20d..e76e4a2a 100644
--- a/refstack-ui/app/components/guidelines/guidelinesController.js
+++ b/refstack-ui/app/components/guidelines/guidelinesController.js
@@ -140,7 +140,10 @@
             var targetComponents = null;
 
             var old_type = ctrl.gl_type;
-            if (ctrl.target === 'dns' || ctrl.target === 'orchestration') {
+            if (ctrl.target === 'dns' ||
+                ctrl.target === 'orchestration' ||
+                ctrl.target === 'shared_file_system'
+               ) {
                 ctrl.gl_type = ctrl.target;
             } else {
                 ctrl.gl_type = 'powered';
diff --git a/refstack-ui/app/components/home/home.html b/refstack-ui/app/components/home/home.html
index f4c16fda..7a732758 100644
--- a/refstack-ui/app/components/home/home.html
+++ b/refstack-ui/app/components/home/home.html
@@ -30,6 +30,7 @@
             <li>OpenStack Powered Object Storage</li>
             <li>OpenStack with DNS</li>
             <li>OpenStack with Orchestration</li>
+            <li>OpenStack with Shared File System</li>
         </ul>
     </div>
 </div>
diff --git a/refstack-ui/app/components/products/partials/testsTable.html b/refstack-ui/app/components/products/partials/testsTable.html
index 346efb34..b1604124 100644
--- a/refstack-ui/app/components/products/partials/testsTable.html
+++ b/refstack-ui/app/components/products/partials/testsTable.html
@@ -94,6 +94,7 @@
                     <option value="object">OpenStack Powered Object Storage</option>
                     <option value="dns">OpenStack with DNS</option>
                     <option value="orchestration">OpenStack with Orchestration</option>
+                    <option value="shared_file_system">OpenStack with Shared File System</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 ee649703..5fca087b 100644
--- a/refstack-ui/app/components/products/productController.js
+++ b/refstack-ui/app/components/products/productController.js
@@ -60,7 +60,8 @@
             'compute': 'OpenStack Powered Compute',
             'object': 'OpenStack Powered Object Storage',
             'dns': 'OpenStack with DNS',
-            'orchestration': 'OpenStack with Orchestration'
+            'orchestration': 'OpenStack with Orchestration',
+            'shared_file_system': 'OpenStack with Shared File System'
         };
 
         // 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 896b5d1c..77fe5548 100644
--- a/refstack-ui/app/components/results-report/partials/editTestModal.html
+++ b/refstack-ui/app/components/results-report/partials/editTestModal.html
@@ -29,6 +29,7 @@
                 <option value="object">OpenStack Powered Object Storage</option>
                 <option value="dns">OpenStack with DNS</option>
                 <option value="orchestration">OpenStack with Orchestration</option>
+                <option value="shared_file_system">OpenStack with Shared File System</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 7d022647..661a4093 100644
--- a/refstack-ui/app/components/results-report/resultsReport.html
+++ b/refstack-ui/app/components/results-report/resultsReport.html
@@ -87,6 +87,7 @@
                 <option value="object">OpenStack Powered Object Storage</option>
                 <option value="dns">OpenStack with DNS</option>
                 <option value="orchestration">OpenStack with Orchestration</option>
+                <option value="shared_file_system">OpenStack with Shared File System</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 e97d4600..e45d2401 100644
--- a/refstack-ui/app/components/results-report/resultsReportController.js
+++ b/refstack-ui/app/components/results-report/resultsReportController.js
@@ -68,7 +68,8 @@
             'compute': 'OpenStack Powered Compute',
             'object': 'OpenStack Powered Object Storage',
             'dns': 'OpenStack with DNS',
-            'orchestration': 'OpenStack with orchestration'
+            'orchestration': 'OpenStack with orchestration',
+            'shared_file_system': 'OpenStack with Shared File System'
         };
 
         /** The schema version of the currently selected guideline data. */
@@ -90,7 +91,10 @@
          * Sample API return array: ["2015.03.json", "2015.04.json"]
          */
         function getVersionList() {
-            if (ctrl.target === 'dns' || ctrl.target === 'orchestration') {
+            if (ctrl.target === 'dns' ||
+                ctrl.target === 'orchestration' ||
+                ctrl.target === 'shared_file_system'
+               ) {
                 ctrl.gl_type = ctrl.target;
 
             } else {
@@ -279,7 +283,10 @@
             var targetCaps = {};
             var targetComponents = null;
             var old_type = ctrl.gl_type;
-            if (ctrl.target === 'dns' || ctrl.target === 'orchestration') {
+            if (ctrl.target === 'dns' ||
+                ctrl.target === 'orchestration' ||
+                ctrl.target === 'shared_file_system'
+               ) {
                 ctrl.gl_type = ctrl.target;
             } else {
                 ctrl.gl_type = 'powered';
diff --git a/refstack-ui/app/components/results/results.html b/refstack-ui/app/components/results/results.html
index d627a1fc..ade812f3 100644
--- a/refstack-ui/app/components/results/results.html
+++ b/refstack-ui/app/components/results/results.html
@@ -157,6 +157,7 @@
                         <option value="object">OpenStack Powered Object Storage</option>
                         <option value="dns">OpenStack with DNS</option>
                         <option value="orchestration">OpenStack with Orchestration</option>
+                        <option value="shared_file_system">OpenStack with Shared File System</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 6ff3a49f..e6d08df0 100644
--- a/refstack-ui/app/components/results/resultsController.js
+++ b/refstack-ui/app/components/results/resultsController.js
@@ -42,7 +42,10 @@
         ctrl.associateProductVersion = associateProductVersion;
         ctrl.getProductVersions = getProductVersions;
         ctrl.prepVersionEdit = prepVersionEdit;
-        if (ctrl.target === 'dns' || ctrl.target === 'orchestration') {
+        if (ctrl.target === 'dns' ||
+            ctrl.target === 'orchestration' ||
+            ctrl.target === 'shared_file_system'
+           ) {
             ctrl.gl_type = ctrl.target;
         } else {
             ctrl.gl_type = 'powered';
@@ -54,7 +57,8 @@
             'compute': 'OpenStack Powered Compute',
             'object': 'OpenStack Powered Object Storage',
             'dns': 'OpenStack with DNS',
-            'orchestration': 'OpenStack with Orchestration'
+            'orchestration': 'OpenStack with Orchestration',
+            'shared_file_system': 'OpenStack with Shared File System'
         };
 
         /** Initial page to be on. */
diff --git a/refstack/api/guidelines.py b/refstack/api/guidelines.py
index 2ac10bf6..448a2118 100755
--- a/refstack/api/guidelines.py
+++ b/refstack/api/guidelines.py
@@ -162,10 +162,11 @@ class Guidelines:
                 'compute': 'OpenStack Powered Compute',
                 'object': 'OpenStack Powered Storage',
                 'dns': 'OpenStack with DNS',
-                'orchestration': 'OpenStack with Orchestration'
+                'orchestration': 'OpenStack with Orchestration',
+                'shared_file_system': 'OpenStack with Shared File System'
 
             }
-            if target == 'dns' or target == 'orchestration':
+            if target in ['dns', 'orchestration', 'shared_file_system']:
                 targets = ['os_powered_' + target]
             else:
                 comps = \