diff --git a/anthropic_usage_and_costs/manifest.json b/anthropic_usage_and_costs/manifest.json
index 7bd336f54e864..73b69d82d33d1 100644
--- a/anthropic_usage_and_costs/manifest.json
+++ b/anthropic_usage_and_costs/manifest.json
@@ -28,9 +28,6 @@
       "Category::Metrics",
       "Category::Cost Management",
       "Submitted Data Type::Metrics",
-      "Supported OS::Linux",
-      "Supported OS::Windows",
-      "Supported OS::macOS",
       "Offering::Integration"
     ]
   },
diff --git a/beyondtrust_password_safe/manifest.json b/beyondtrust_password_safe/manifest.json
index ae7b83ae193fd..52a4abe45e00a 100644
--- a/beyondtrust_password_safe/manifest.json
+++ b/beyondtrust_password_safe/manifest.json
@@ -34,9 +34,6 @@
       }
     ],
     "classifier_tags": [
-      "Supported OS::Linux",
-      "Supported OS::Windows",
-      "Supported OS::macOS",
       "Category::Log Collection",
       "Category::Security",
       "Submitted Data Type::Logs",
diff --git a/bitdefender/manifest.json b/bitdefender/manifest.json
index 7b36ea1b5e33c..dc851d3186ee6 100644
--- a/bitdefender/manifest.json
+++ b/bitdefender/manifest.json
@@ -54,9 +54,6 @@
       }
     ],
     "classifier_tags": [
-      "Supported OS::Linux",
-      "Supported OS::Windows",
-      "Supported OS::macOS",
       "Category::Log Collection",
       "Category::Security",
       "Offering::Integration",
diff --git a/cisco_sdwan/manifest.json b/cisco_sdwan/manifest.json
index 2df06d5267b84..96ee8c676f812 100644
--- a/cisco_sdwan/manifest.json
+++ b/cisco_sdwan/manifest.json
@@ -13,9 +13,6 @@
     "title": "Cisco SD-WAN",
     "media": [],
     "classifier_tags": [
-      "Supported OS::Linux",
-      "Supported OS::Windows",
-      "Supported OS::macOS",
       "Category::Network",
       "Offering::Integration"
     ]
diff --git a/cisco_secure_firewall/manifest.json b/cisco_secure_firewall/manifest.json
index f71d3f0f8607f..cfd6cf2b1d35d 100644
--- a/cisco_secure_firewall/manifest.json
+++ b/cisco_secure_firewall/manifest.json
@@ -54,9 +54,6 @@
       }
     ],
     "classifier_tags": [
-      "Supported OS::Linux",
-      "Supported OS::Windows",
-      "Supported OS::macOS",
       "Category::Network",
       "Category::Security",
       "Category::Log Collection",
diff --git a/falco/manifest.json b/falco/manifest.json
index 8d87f99a9505a..71a2bae1cdb48 100644
--- a/falco/manifest.json
+++ b/falco/manifest.json
@@ -27,9 +27,6 @@
       "Category::Log Collection",
       "Category::Security",
       "Submitted Data Type::Logs",
-      "Supported OS::Linux",
-      "Supported OS::Windows",
-      "Supported OS::macOS",
       "Offering::Integration"
     ]
   },
diff --git a/iboss/manifest.json b/iboss/manifest.json
index 346cdd24e9dc0..7ab752421ee1c 100644
--- a/iboss/manifest.json
+++ b/iboss/manifest.json
@@ -54,9 +54,6 @@
       }
     ],
     "classifier_tags": [
-      "Supported OS::Linux",
-      "Supported OS::Windows",
-      "Supported OS::macOS",
       "Category::Security",
       "Category::Metrics",
       "Category::Log Collection",
diff --git a/ping_federate/manifest.json b/ping_federate/manifest.json
index 37b2764a20bf6..e942313b48243 100644
--- a/ping_federate/manifest.json
+++ b/ping_federate/manifest.json
@@ -24,9 +24,6 @@
       }
     ],
     "classifier_tags": [
-      "Supported OS::Linux",
-      "Supported OS::Windows",
-      "Supported OS::macOS",
       "Category::Log Collection",
       "Category::Security",
       "Offering::Integration",
diff --git a/snowflake/manifest.json b/snowflake/manifest.json
index af6a432ff1a69..2f3cc970fd905 100644
--- a/snowflake/manifest.json
+++ b/snowflake/manifest.json
@@ -13,9 +13,6 @@
     "title": "Snowflake - Agent based (Deprecated)",
     "media": [],
     "classifier_tags": [
-      "Supported OS::Linux",
-      "Supported OS::macOS",
-      "Supported OS::Windows",
       "Category::Cloud",
       "Category::Data Stores",
       "Category::Cost Management",
diff --git a/sonicwall_firewall/manifest.json b/sonicwall_firewall/manifest.json
index 044db6fb13ea2..9f102d503b9fb 100644
--- a/sonicwall_firewall/manifest.json
+++ b/sonicwall_firewall/manifest.json
@@ -49,9 +49,6 @@
         }
       ],
       "classifier_tags": [
-        "Supported OS::Linux",
-        "Supported OS::Windows",
-        "Supported OS::macOS",
         "Category::Log Collection",
         "Category::Security",
         "Offering::Integration",
diff --git a/supply_chain_firewall/assets/logs/supply-chain-firewall_tests.yaml b/supply_chain_firewall/assets/logs/supply-chain-firewall_tests.yaml
index ff1e7a563115a..66a57e653187b 100644
--- a/supply_chain_firewall/assets/logs/supply-chain-firewall_tests.yaml
+++ b/supply_chain_firewall/assets/logs/supply-chain-firewall_tests.yaml
@@ -1,43 +1,42 @@
 # bypass-global-timestamp-format-in-sample-checks
 id: supply-chain-firewall
 tests:
- -
-  sample: |-
-    {
-      "msg" : "Command 'pip install urllib3==2.0.2' was allowed",
-      "ecosystem" : "PyPI",
-      "created" : 1755017456.590666,
-      "source" : "scfw",
-      "env" : "dev",
-      "version" : "2.1.0",
-      "targets" : [ "urllib3-2.0.2" ],
-      "executable" : "/home/devuser/.venv/bin/python",
-      "hostname" : "test10-10-1-10",
-      "package_manager" : "pip",
-      "service" : "scfw",
-      "warned" : true,
-      "action" : "ALLOW",
-      "username" : "root"
-    }
-  result:
-    custom:
-      created: 1.755017456590666E12
-      ecosystem: "PyPI"
-      env: "dev"
-      evt:
-        outcome: "ALLOW"
-      executable: "/home/devuser/.venv/bin/python"
-      hostname: "test10-10-1-10"
-      package_manager: "pip"
-      service: "scfw"
-      source: "scfw"
-      targets:
-       - "urllib3-2.0.2"
-      usr:
-        name: "root"
-      version: "2.1.0"
-      warned: true
-    message: "Command 'pip install urllib3==2.0.2' was allowed"
-    tags:
-     - "source:LOGS_SOURCE"
-    timestamp: 1755017456590
+  - sample: |-
+      {
+        "msg" : "Command 'pip install urllib3==2.0.2' was allowed",
+        "ecosystem" : "PyPI",
+        "created" : 1755017456.590666,
+        "source" : "scfw",
+        "env" : "dev",
+        "version" : "2.1.0",
+        "targets" : [ "urllib3-2.0.2" ],
+        "executable" : "/home/devuser/.venv/bin/python",
+        "hostname" : "test10-10-1-10",
+        "package_manager" : "pip",
+        "service" : "scfw",
+        "warned" : true,
+        "action" : "ALLOW",
+        "username" : "root"
+      }
+    result:
+      custom:
+        created: 1.755017456590666E12
+        ecosystem: "PyPI"
+        env: "dev"
+        evt:
+          outcome: "ALLOW"
+        executable: "/home/devuser/.venv/bin/python"
+        hostname: "test10-10-1-10"
+        package_manager: "pip"
+        service: "scfw"
+        source: "scfw"
+        targets:
+          - "urllib3-2.0.2"
+        usr:
+          name: "root"
+        version: "2.1.0"
+        warned: true
+      message: "Command 'pip install urllib3==2.0.2' was allowed"
+      tags:
+        - "source:LOGS_SOURCE"
+      timestamp: 1755017456590
diff --git a/supply_chain_firewall/manifest.json b/supply_chain_firewall/manifest.json
index 3473b8d20bbea..a7681104839fe 100644
--- a/supply_chain_firewall/manifest.json
+++ b/supply_chain_firewall/manifest.json
@@ -24,8 +24,6 @@
       }
     ],
     "classifier_tags": [
-      "Supported OS::Linux",
-      "Supported OS::macOS",
       "Category::Log Collection",
       "Category::Security",
       "Offering::Integration",