diff --git a/.ps-rule/na-suppress.Rule.yaml b/.ps-rule/na-suppress.Rule.yaml
index 9bbc220c76..fdb40890f7 100644
--- a/.ps-rule/na-suppress.Rule.yaml
+++ b/.ps-rule/na-suppress.Rule.yaml
@@ -26,6 +26,7 @@ spec:
       - Microsoft.Authorization/policyExemptions
       - Microsoft.Authorization/policySetDefinitions
       - Microsoft.Authorization/locks
-      - Microsoft.AADDomainServices/oucontainer
-      - Microsoft.ApiManagementservice/eventGridFilters
+      - Microsoft.AAD/DomainServices/oucontainer
+      - Microsoft.ApiManagement/service/eventGridFilters
+      - Microsoft.EventGrid/eventSubscriptions
       - Microsoft.Automation/automationAccounts/softwareUpdateConfigurations
diff --git a/modules/Microsoft.Purview/accounts/.test/common/deploy.test.bicep b/modules/Microsoft.Purview/accounts/.test/common/deploy.test.bicep
index 15477693b5..359b97de9f 100644
--- a/modules/Microsoft.Purview/accounts/.test/common/deploy.test.bicep
+++ b/modules/Microsoft.Purview/accounts/.test/common/deploy.test.bicep
@@ -94,6 +94,10 @@ module testDeployment '../../deploy.bicep' = {
         }
         service: 'account'
         subnetResourceId: nestedDependencies.outputs.subnetResourceId
+        tags: {
+          Environment: 'Non-Prod'
+          Role: 'DeploymentValidation'
+        }
       }
     ]
     portalPrivateEndpoints: [
@@ -105,6 +109,10 @@ module testDeployment '../../deploy.bicep' = {
         }
         service: 'portal'
         subnetResourceId: nestedDependencies.outputs.subnetResourceId
+        tags: {
+          Environment: 'Non-Prod'
+          Role: 'DeploymentValidation'
+        }
       }
     ]
     storageBlobPrivateEndpoints: [
@@ -116,6 +124,10 @@ module testDeployment '../../deploy.bicep' = {
         }
         service: 'blob'
         subnetResourceId: nestedDependencies.outputs.subnetResourceId
+        tags: {
+          Environment: 'Non-Prod'
+          Role: 'DeploymentValidation'
+        }
       }
     ]
     storageQueuePrivateEndpoints: [
@@ -127,6 +139,10 @@ module testDeployment '../../deploy.bicep' = {
         }
         service: 'queue'
         subnetResourceId: nestedDependencies.outputs.subnetResourceId
+        tags: {
+          Environment: 'Non-Prod'
+          Role: 'DeploymentValidation'
+        }
       }
     ]
     eventHubPrivateEndpoints: [
@@ -138,6 +154,10 @@ module testDeployment '../../deploy.bicep' = {
         }
         service: 'namespace'
         subnetResourceId: nestedDependencies.outputs.subnetResourceId
+        tags: {
+          Environment: 'Non-Prod'
+          Role: 'DeploymentValidation'
+        }
       }
     ]
     enableDefaultTelemetry: enableDefaultTelemetry
diff --git a/modules/Microsoft.Purview/accounts/readme.md b/modules/Microsoft.Purview/accounts/readme.md
index e27e4e2145..97199dbcd5 100644
--- a/modules/Microsoft.Purview/accounts/readme.md
+++ b/modules/Microsoft.Purview/accounts/readme.md
@@ -240,6 +240,10 @@ module accounts './Microsoft.Purview/accounts/deploy.bicep' = {
         }
         service: 'account'
         subnetResourceId: '<subnetResourceId>'
+        tags: {
+          Environment: 'Non-Prod'
+          Role: 'DeploymentValidation'
+        }
       }
     ]
     diagnosticEventHubAuthorizationRuleId: '<diagnosticEventHubAuthorizationRuleId>'
@@ -263,6 +267,10 @@ module accounts './Microsoft.Purview/accounts/deploy.bicep' = {
         }
         service: 'namespace'
         subnetResourceId: '<subnetResourceId>'
+        tags: {
+          Environment: 'Non-Prod'
+          Role: 'DeploymentValidation'
+        }
       }
     ]
     location: '<location>'
@@ -277,6 +285,10 @@ module accounts './Microsoft.Purview/accounts/deploy.bicep' = {
         }
         service: 'portal'
         subnetResourceId: '<subnetResourceId>'
+        tags: {
+          Environment: 'Non-Prod'
+          Role: 'DeploymentValidation'
+        }
       }
     ]
     publicNetworkAccess: 'Disabled'
@@ -298,6 +310,10 @@ module accounts './Microsoft.Purview/accounts/deploy.bicep' = {
         }
         service: 'blob'
         subnetResourceId: '<subnetResourceId>'
+        tags: {
+          Environment: 'Non-Prod'
+          Role: 'DeploymentValidation'
+        }
       }
     ]
     storageQueuePrivateEndpoints: [
@@ -309,6 +325,10 @@ module accounts './Microsoft.Purview/accounts/deploy.bicep' = {
         }
         service: 'queue'
         subnetResourceId: '<subnetResourceId>'
+        tags: {
+          Environment: 'Non-Prod'
+          Role: 'DeploymentValidation'
+        }
       }
     ]
     tags: {
@@ -348,7 +368,11 @@ module accounts './Microsoft.Purview/accounts/deploy.bicep' = {
             ]
           },
           "service": "account",
-          "subnetResourceId": "<subnetResourceId>"
+          "subnetResourceId": "<subnetResourceId>",
+          "tags": {
+            "Environment": "Non-Prod",
+            "Role": "DeploymentValidation"
+          }
         }
       ]
     },
@@ -389,7 +413,11 @@ module accounts './Microsoft.Purview/accounts/deploy.bicep' = {
             ]
           },
           "service": "namespace",
-          "subnetResourceId": "<subnetResourceId>"
+          "subnetResourceId": "<subnetResourceId>",
+          "tags": {
+            "Environment": "Non-Prod",
+            "Role": "DeploymentValidation"
+          }
         }
       ]
     },
@@ -411,7 +439,11 @@ module accounts './Microsoft.Purview/accounts/deploy.bicep' = {
             ]
           },
           "service": "portal",
-          "subnetResourceId": "<subnetResourceId>"
+          "subnetResourceId": "<subnetResourceId>",
+          "tags": {
+            "Environment": "Non-Prod",
+            "Role": "DeploymentValidation"
+          }
         }
       ]
     },
@@ -438,7 +470,11 @@ module accounts './Microsoft.Purview/accounts/deploy.bicep' = {
             ]
           },
           "service": "blob",
-          "subnetResourceId": "<subnetResourceId>"
+          "subnetResourceId": "<subnetResourceId>",
+          "tags": {
+            "Environment": "Non-Prod",
+            "Role": "DeploymentValidation"
+          }
         }
       ]
     },
@@ -451,7 +487,11 @@ module accounts './Microsoft.Purview/accounts/deploy.bicep' = {
             ]
           },
           "service": "queue",
-          "subnetResourceId": "<subnetResourceId>"
+          "subnetResourceId": "<subnetResourceId>",
+          "tags": {
+            "Environment": "Non-Prod",
+            "Role": "DeploymentValidation"
+          }
         }
       ]
     },