diff --git a/config/ModuleMetadata.json b/config/ModuleMetadata.json
index 57a975e663a..2030ca8a992 100644
--- a/config/ModuleMetadata.json
+++ b/config/ModuleMetadata.json
@@ -18,7 +18,9 @@
     "AzureAD",
     "SharePoint",
     "Intune",
-    "AzureAutomationNotSupported"
+    "AzureAutomationNotSupported",
+    "PSModule",
+    "PSIncludes_Cmdlet"
   ],
   "releaseNotes": "See https://aka.ms/GraphPowerShell-Release.",
   "assemblyOriginatorKeyFile": "35MSSharedLib1024.snk",
diff --git a/src/Authentication/Authentication/Microsoft.Graph.Authentication.nuspec b/src/Authentication/Authentication/Microsoft.Graph.Authentication.nuspec
index d0216fc640b..bd10d24995c 100644
--- a/src/Authentication/Authentication/Microsoft.Graph.Authentication.nuspec
+++ b/src/Authentication/Authentication/Microsoft.Graph.Authentication.nuspec
@@ -11,7 +11,7 @@
     <iconUrl>https://raw.githubusercontent.com/microsoftgraph/msgraph-sdk-powershell/master/documentation/images/graph_color256.png</iconUrl>
     <projectUrl>https://github.com/microsoftgraph/msgraph-sdk-powershell</projectUrl>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <tags>Microsoft Office365 Graph PowerShell GraphServiceClient Outlook OneDrive AzureAD GraphAPI Productivity SharePoint Intune SDK</tags>
+    <tags>Microsoft Office365 Graph PowerShell GraphServiceClient Outlook OneDrive AzureAD GraphAPI Productivity SharePoint Intune SDK PSModule PSIncludes_Cmdlet</tags>
     <releaseNotes>See https://aka.ms/GraphPowerShell-Release.</releaseNotes>
     <dependencies />
   </metadata>
diff --git a/src/readme.graph.md b/src/readme.graph.md
index 94fe7df6792..82d49656ff1 100644
--- a/src/readme.graph.md
+++ b/src/readme.graph.md
@@ -13,7 +13,7 @@ metadata:
     companyName: Microsoft Corporation
     description: 'Microsoft Graph PowerShell Cmdlets'
     copyright: &copy; Microsoft Corporation. All rights reserved.
-    tags: Microsoft Office365 Graph PowerShell
+    tags: Microsoft Office365 Graph PowerShell PSModule PSIncludes_Cmdlet
     requireLicenseAcceptance: true
     licenseUri: https://aka.ms/devservicesagreement
     projectUri: https://github.com/microsoftgraph/msgraph-sdk-powershell