diff --git a/etc/firefox/policies/policies.json b/etc/firefox/policies/policies.json
index 4bec3cb5..ffc48427 100644
--- a/etc/firefox/policies/policies.json
+++ b/etc/firefox/policies/policies.json
@@ -36,6 +36,7 @@
         "uBlock0@raymondhill.net": {
           "toAdd": {
             "trustedSiteDirectives": [
+              "azure.com",
               "bittimittari.fi",
               "chrome-extension-scheme",
               "cloudflare.com",
@@ -49,7 +50,10 @@
               "live.com",
               "matrix.org",
               "microsoft.com",
+              "microsoft365.com",
+              "microsoftonline.com",
               "moz-extension-scheme",
+              "office.com",
               "one.one",
               "pikaviestin.fi"
             ]
@@ -124,24 +128,10 @@
     "DisplayBookmarksToolbar": "never",
     "DontCheckDefaultBrowser": true,
     "EnableTrackingProtection": {
+      "Comment": "Managing tracking protection is left for the user unless there is a heavy reason to do otherwise.",
       "Cryptomining": true,
       "EmailTracking": true,
       "Exceptions": [
-        "https://ac.ecosia.org",
-        "https://app.element.io",
-        "https://bittimittari.fi",
-        "https://challenges.cloudflare.com",
-        "https://chat.pikaviestin.fi",
-        "https://develop.element.io",
-        "https://glowing-bear.org",
-        "https://keyoxide.org",
-        "https://latest.glowing-bear.org",
-        "https://learn.microsoft.com",
-        "https://one.one.one.one",
-        "https://pp-attester-turnstile.research.cloudflare.com",
-        "https://staging.element.io",
-        "https://teams.microsoft.com",
-        "https://webchat.disroot.org",
         "https://www.ecosia.org"
       ],
       "Fingerprinting": true,
diff --git a/etc/opt/chromium/policies/managed/aminda-extensions.json b/etc/opt/chromium/policies/managed/aminda-extensions.json
index 82145ddc..2d595644 100644
--- a/etc/opt/chromium/policies/managed/aminda-extensions.json
+++ b/etc/opt/chromium/policies/managed/aminda-extensions.json
@@ -10,6 +10,7 @@
       "cjpalhdlnbpafiamejdnhcphjbkeiagm": {
         "toAdd": {
           "trustedSiteDirectives": [
+            "azure.com",
             "bittimittari.fi",
             "chrome-extension-scheme",
             "cloudflare.com",
@@ -23,7 +24,10 @@
             "live.com",
             "matrix.org",
             "microsoft.com",
+            "microsoft365.com",
+            "microsoftonline.com",
             "moz-extension-scheme",
+            "office.com",
             "one.one",
             "pikaviestin.fi"
           ]
diff --git a/etc/opt/chromium/policies/managed/brave-shields-disabled.json b/etc/opt/chromium/policies/managed/brave-shields-disabled.json
index c694d30c..90e507f8 100644
--- a/etc/opt/chromium/policies/managed/brave-shields-disabled.json
+++ b/etc/opt/chromium/policies/managed/brave-shields-disabled.json
@@ -1,20 +1,6 @@
 {
   "BraveShieldsDisabledForUrls": [
-    "https://ac.ecosia.org",
-    "https://app.element.io",
-    "https://bittimittari.fi",
-    "https://challenges.cloudflare.com",
-    "https://chat.pikaviestin.fi",
-    "https://develop.element.io",
-    "https://glowing-bear.org",
-    "https://keyoxide.org",
-    "https://latest.glowing-bear.org",
-    "https://learn.microsoft.com",
-    "https://one.one.one.one",
-    "https://pp-attester-turnstile.research.cloudflare.com",
-    "https://staging.element.io",
-    "https://teams.microsoft.com",
-    "https://webchat.disroot.org",
     "https://www.ecosia.org"
-  ]
+  ],
+  "BraveShieldsDisabledForUrls_comment": "Managing tracking protection is left for the user unless there is a heavy reason to do otherwise."
 }