diff --git a/Config/AXE-TENANT.BPATemplate.json b/Config/AXE-TENANT.BPATemplate.json
index 5cadbe685ace..88d9cb5075d3 100644
--- a/Config/AXE-TENANT.BPATemplate.json
+++ b/Config/AXE-TENANT.BPATemplate.json
@@ -218,17 +218,17 @@
       ]
     },
     {
-      "name": "UserAllowedToCreateUnifiedGroups",
+      "name": "UserNotAllowedToCreateUnifiedGroups",
       "API": "Graph",
-      "URL": "https://graph.microsoft.com/v1.0/groupSettings?$select=values",
-      "where": "$_.values | Where-Object { $_.name -eq 'EnableGroupCreation' -and $_.value -eq $true }",
+      "URL": "https://graph.microsoft.com/v1.0/groupSettings?$select=values,displayName",
+      "where": "$_.displayName -eq 'Group.Unified' -and ($_.values | Where-Object { $_.name -eq 'EnableGroupCreation' -and $_.value -eq $false }).Count -gt 0",
       "StoreAs": "bool",
       "FrontendFields": [
         {
           "name": "Unified group creation disabled",
-          "desc": "Check if users are allowed to create Unified groups",
-          "value": "UserAllowedToCreateUnifiedGroups",
-          "formatter": "reverseBool"
+          "desc": "Check if users are allowed to create unified groups (M365 groups) (Currently not working)",
+          "value": "UserNotAllowedToCreateUnifiedGroups",
+          "formatter": "bool"
         }
       ]
     },
@@ -267,6 +267,23 @@
         }
       ]
     },
+    {
+      "name": "OutlookAdditionalStorageProvidersAvailable",
+      "API": "Exchange",
+      "Command": "Get-OwaMailboxPolicy",
+      "ExtractFields": [
+        "AdditionalStorageProvidersAvailable"
+      ],
+      "StoreAs": "bool",
+      "FrontendFields": [
+        {
+          "name": "Outlook additional storage providers disabled",
+          "desc": "Check if additional storage providers are disabled for Outlook",
+          "value": "OutlookAdditionalStorageProvidersAvailable",
+          "formatter": "reverseBool"
+        }
+      ]
+    },
     {
       "name": "SharepointSiteCreationEnabled",
       "API": "Graph",