diff --git a/windows/access-protection/docfx.json b/windows/access-protection/docfx.json
index 22574d09a4..2a01ff236f 100644
--- a/windows/access-protection/docfx.json
+++ b/windows/access-protection/docfx.json
@@ -33,7 +33,9 @@
     "globalMetadata": {
 		"uhfHeaderId": "MSDocsHeader-WindowsIT", 
 		"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
-		"ms.technology": "windows"
+		"ms.technology": "windows",
+		"ms.topic": "article",
+		"ms.author": "justinha"
 	},
     "fileMetadata": {},
     "template": [],
diff --git a/windows/application-management/docfx.json b/windows/application-management/docfx.json
index cc2687ac6a..62b8aeb9de 100644
--- a/windows/application-management/docfx.json
+++ b/windows/application-management/docfx.json
@@ -33,7 +33,9 @@
     "globalMetadata": {
 		"uhfHeaderId": "MSDocsHeader-WindowsIT", 
 		"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
-		"ms.technology": "windows"
+		"ms.technology": "windows",
+		"ms.topic": "article",
+		"ms.author": "elizapo"
 	},
     "fileMetadata": {},
     "template": [],
diff --git a/windows/client-management/docfx.json b/windows/client-management/docfx.json
index b42d904675..72ba73ffff 100644
--- a/windows/client-management/docfx.json
+++ b/windows/client-management/docfx.json
@@ -33,7 +33,9 @@
     "globalMetadata": {
 		"uhfHeaderId": "MSDocsHeader-WindowsIT", 
 		"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
-		"ms.technology": "windows"
+		"ms.technology": "windows",
+		"ms.topic": "article",
+		"ms.author": "dongill"
 	},
     "fileMetadata": {},
     "template": [],
diff --git a/windows/configuration/docfx.json b/windows/configuration/docfx.json
index 9e4397cd87..f9b0e89ad4 100644
--- a/windows/configuration/docfx.json
+++ b/windows/configuration/docfx.json
@@ -33,7 +33,9 @@
     "globalMetadata": {
 		"uhfHeaderId": "MSDocsHeader-WindowsIT", 
 		"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
-		"ms.technology": "windows"
+		"ms.technology": "windows",
+		"ms.topic": "article",
+		"ms.author": "jdecker"
 	},
     "fileMetadata": {},
     "template": [],
diff --git a/windows/deployment/docfx.json b/windows/deployment/docfx.json
index 3c58607382..3df45b300e 100644
--- a/windows/deployment/docfx.json
+++ b/windows/deployment/docfx.json
@@ -33,7 +33,9 @@
     "globalMetadata": {
 		"uhfHeaderId": "MSDocsHeader-WindowsIT", 
 		"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
-		"ms.technology": "windows"
+		"ms.technology": "windows",
+		"ms.topic": "article",
+		"ms.author": "greglin"
 	},
     "fileMetadata": {},
     "template": [],
diff --git a/windows/device-security/docfx.json b/windows/device-security/docfx.json
index c0e36621af..ebbbf433db 100644
--- a/windows/device-security/docfx.json
+++ b/windows/device-security/docfx.json
@@ -33,7 +33,9 @@
     "globalMetadata": {
 		"uhfHeaderId": "MSDocsHeader-WindowsIT", 
 		"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
-		"ms.technology": "windows"
+		"ms.technology": "windows",
+		"ms.topic": "article",
+		"ms.author": "justinha"
 	},
     "fileMetadata": {},
     "template": [],
diff --git a/windows/device-security/tpm/tpm-recommendations.md b/windows/device-security/tpm/tpm-recommendations.md
index 20d05b68d2..1b874b2988 100644
--- a/windows/device-security/tpm/tpm-recommendations.md
+++ b/windows/device-security/tpm/tpm-recommendations.md
@@ -100,8 +100,8 @@ The following table defines which Windows features require TPM support.
 
 | Windows Features        | Windows 10 TPM 1.2   | Windows 10 TPM 2.0   | Details  |
 |-------------------------|----------------------|----------------------|----------|
-| Measured Boot                                | Required                 | Required                 | Measured boot requires TPM 1.2 or 2.0 and UEFI Secure boot.   |
-| Bitlocker                                    | Required                 | Required                 | TPM 1.2 or later required or a removable USB memory device such as a flash drive.  |
+| Measured Boot                                | Required                 | Required                 | Measured boot requires TPM 1.2 or 2.0 and UEFI Secure Boot.   |
+| Bitlocker                                    | Required                 | Required                 | TPM 1.2 or later required or a removable USB memory device such as a flash drive. Please note that TPM 2.0 requires UEFI Secure Boot in order for BitLocker to work properly.  |
 | Passport: Domain AADJ Join                   | Required                 | Required                 | Supports both versions of TPM, but requires TPM with HMAC and EK certificate for key attestation support.  |
 | Passport: MSA or Local Account               | Required                 | Required                 | TPM 2.0 is required with HMAC and EK certificate for key attestation support.      |
 | Device Encryption                            | Not Applicable           | Required                 | TPM 2.0 is required for all InstantGo devices.                |
@@ -120,4 +120,4 @@ Government customers and enterprise customers in regulated industries may have a
 
 ## Related topics
 
-- [Trusted Platform Module](trusted-platform-module-top-node.md) (list of topics)
\ No newline at end of file
+- [Trusted Platform Module](trusted-platform-module-top-node.md) (list of topics)
diff --git a/windows/hub/docfx.json b/windows/hub/docfx.json
index e134b0e320..8c9110e8b7 100644
--- a/windows/hub/docfx.json
+++ b/windows/hub/docfx.json
@@ -35,7 +35,9 @@
     "globalMetadata": {
 		"uhfHeaderId": "MSDocsHeader-WindowsIT", 
 		"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
-		"ms.technology": "windows"
+		"ms.technology": "windows",
+		"ms.topic": "article",
+		"ms.author": "brianlic"
 	},
     "fileMetadata": {},
     "template": [],
diff --git a/windows/threat-protection/docfx.json b/windows/threat-protection/docfx.json
index 1078120934..d0865639cb 100644
--- a/windows/threat-protection/docfx.json
+++ b/windows/threat-protection/docfx.json
@@ -33,7 +33,9 @@
     "globalMetadata": {
 		"uhfHeaderId": "MSDocsHeader-WindowsIT", 
 		"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
-		"ms.technology": "windows"
+		"ms.technology": "windows",
+		"ms.topic": "article",
+		"ms.author": "justinha"
 	},
     "fileMetadata": {},
     "template": [],
diff --git a/windows/whats-new/docfx.json b/windows/whats-new/docfx.json
index 3c9739ce2e..bdecd75985 100644
--- a/windows/whats-new/docfx.json
+++ b/windows/whats-new/docfx.json
@@ -33,7 +33,9 @@
     "globalMetadata": {
 		"uhfHeaderId": "MSDocsHeader-WindowsIT", 
 		"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
-		"ms.technology": "windows"
+		"ms.technology": "windows",
+		"ms.topic": "article",
+		"ms.author": "trudyha"
 	},
     "fileMetadata": {},
     "template": [],