diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
index ebbb9df5cb..2298fb1c2f 100644
--- a/.openpublishing.publish.config.json
+++ b/.openpublishing.publish.config.json
@@ -31,8 +31,28 @@
             "type_mapping": {
                 "Conceptual": "Content"
             }
+        },
+        {
+            "docset_name": "surface",
+            "build_output_subfolder": "devices/surface",
+            "locale": "en-us",
+            "version": 0,
+            "open_to_public_contributors": "false",
+            "type_mapping": {
+                "Conceptual": "Content"
+            }
+        },
+        {
+            "docset_name": "surface-hub",
+            "build_output_subfolder": "devices/surface-hub",
+            "locale": "en-us",
+            "version": 0,
+            "open_to_public_contributors": "false",
+            "type_mapping": {
+                "Conceptual": "Content"
+            }
         }
     ],
-    "notification_subscribers": ["brianlic@microsoft.com","brianlic@microsoft.com"],
+    "notification_subscribers": ["brianlic@microsoft.com"],
     "branches_to_filter": ["live"]
 }
diff --git a/devices/surface-hub/docfx.json b/devices/surface-hub/docfx.json
new file mode 100644
index 0000000000..11bc1cdc40
--- /dev/null
+++ b/devices/surface-hub/docfx.json
@@ -0,0 +1,24 @@
+{
+  "build": {
+    "content":
+      [
+        {
+          "files": ["**/**.md"],
+          "exclude": ["**/obj/**"]
+        }
+      ],
+    "resource": [
+        {
+          "files": ["**/images/**", "**/*.json"],
+          "exclude": ["**/obj/**"]
+        }
+    ],
+    "globalMetadata": {
+        "ROBOTS": "INDEX, FOLLOW"
+    },
+    "externalReference": [
+    ],
+    "template": "op.html",
+    "dest": "devices/surface-hub"
+  }
+}
\ No newline at end of file
diff --git a/devices/surface/docfx.json b/devices/surface/docfx.json
new file mode 100644
index 0000000000..7d2f4404d8
--- /dev/null
+++ b/devices/surface/docfx.json
@@ -0,0 +1,24 @@
+{
+  "build": {
+    "content":
+      [
+        {
+          "files": ["**/**.md"],
+          "exclude": ["**/obj/**"]
+        }
+      ],
+    "resource": [
+        {
+          "files": ["**/images/**", "**/*.json"],
+          "exclude": ["**/obj/**"]
+        }
+    ],
+    "globalMetadata": {
+        "ROBOTS": "INDEX, FOLLOW"
+    },
+    "externalReference": [
+    ],
+    "template": "op.html",
+    "dest": "devices/surface"
+  }
+}
\ No newline at end of file