diff --git a/packages/cisco_ise/changelog.yml b/packages/cisco_ise/changelog.yml
index 7dd278dc561..edbb14fae51 100644
--- a/packages/cisco_ise/changelog.yml
+++ b/packages/cisco_ise/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.29.0"
+  changes:
+    - description: Replace navigation with links panels.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/14938
 - version: "1.28.1"
   changes:
     - description: Changed owners.
diff --git a/packages/cisco_ise/kibana/dashboard/cisco_ise-44afda90-3991-11ed-bb16-3b8b6259e7b8.json b/packages/cisco_ise/kibana/dashboard/cisco_ise-44afda90-3991-11ed-bb16-3b8b6259e7b8.json
index 17277789210..70a5bb1c526 100644
--- a/packages/cisco_ise/kibana/dashboard/cisco_ise-44afda90-3991-11ed-bb16-3b8b6259e7b8.json
+++ b/packages/cisco_ise/kibana/dashboard/cisco_ise-44afda90-3991-11ed-bb16-3b8b6259e7b8.json
@@ -145,7 +145,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -157,7 +158,7 @@
                 "panelIndex": "c6de6800-58a4-42a7-8d92-9b5cda5149fe",
                 "title": "Top 10 Admin Name [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -249,7 +250,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -261,7 +263,7 @@
                 "panelIndex": "6c0e8ba3-813e-4cd6-bdef-588038714161",
                 "title": "Distribution of Events by Operation Status [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -353,7 +355,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -365,7 +368,7 @@
                 "panelIndex": "dfa9e762-262a-4c18-8d51-3f6582578bd5",
                 "title": "Distribution of Events by Operation Type [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -390,12 +393,10 @@
         "title": "[Logs Cisco ISE] Posture and Client Provisioning Audit",
         "version": 1
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:09:01.185Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.344Z",
     "id": "cisco_ise-44afda90-3991-11ed-bb16-3b8b6259e7b8",
-    "migrationVersion": {
-        "dashboard": "8.7.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
@@ -441,7 +442,13 @@
             "id": "cisco_ise-47c77dc0-a065-11ec-a0a2-1598702abf83",
             "name": "a96ba462-fb6f-491b-ac11-c337720ff36d:panel_a96ba462-fb6f-491b-ac11-c337720ff36d",
             "type": "search"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "dashboard"
+    "type": "dashboard",
+    "typeMigrationVersion": "8.9.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/dashboard/cisco_ise-506e8200-39a5-11ed-a2b2-1d4b9d412e28.json b/packages/cisco_ise/kibana/dashboard/cisco_ise-506e8200-39a5-11ed-a2b2-1d4b9d412e28.json
index cf38b860d57..ef68c060a8c 100644
--- a/packages/cisco_ise/kibana/dashboard/cisco_ise-506e8200-39a5-11ed-a2b2-1d4b9d412e28.json
+++ b/packages/cisco_ise/kibana/dashboard/cisco_ise-506e8200-39a5-11ed-a2b2-1d4b9d412e28.json
@@ -188,7 +188,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -200,7 +201,7 @@
                 "panelIndex": "4968810a-e87c-4eb5-962c-c649dd2c28ee",
                 "title": "Top 10 Guest User Name [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -286,7 +287,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -298,7 +300,7 @@
                 "panelIndex": "8323cb08-ce09-487a-9a83-141de55bf43b",
                 "title": "Top 10 Device Name for My Devices [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -390,7 +392,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -402,7 +405,7 @@
                 "panelIndex": "c77ce6e1-e797-4c42-bb8b-73051e10125a",
                 "title": "Distribution of Policy Diagnostics by Policy Type [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -494,7 +497,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -506,7 +510,7 @@
                 "panelIndex": "2aee9b15-5050-48a0-ae68-799ff5d534a0",
                 "title": "Distribution of AD Connector Events by AD Hostname [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -592,7 +596,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -604,7 +609,7 @@
                 "panelIndex": "0cf9f3bd-0f93-42fe-b2cc-88510892f995",
                 "title": "Top 10 AD IP Address for AD Connector [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -690,7 +695,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -702,7 +708,7 @@
                 "panelIndex": "45e734b7-45df-463c-8131-e28c0d8a4a72",
                 "title": "Top 10 User Name [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -788,7 +794,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -800,7 +807,7 @@
                 "panelIndex": "f39abb0e-ec25-4dfc-8028-ca213d752509",
                 "title": "Top 10 Device IP [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -886,7 +893,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -898,7 +906,7 @@
                 "panelIndex": "eccab3db-c02a-41ad-8654-be4c9e8cd4e3",
                 "title": "Top 10 IP Address for AAA Diagnostics [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -1019,7 +1027,8 @@
                         "visualizationType": "lnsXY"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -1031,7 +1040,7 @@
                 "panelIndex": "6cfc9161-427e-42ba-8175-21968893b84b",
                 "title": "Distribution of Events by Authentication Method for AAA Diagnostics [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -1152,7 +1161,8 @@
                         "visualizationType": "lnsXY"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -1164,7 +1174,7 @@
                 "panelIndex": "91ebb354-5963-4d3c-80a5-9342957cad08",
                 "title": "Distribution of Events by Current ID Store Name [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -1256,7 +1266,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -1268,7 +1279,7 @@
                 "panelIndex": "4c5dea27-55c5-4e60-bab9-604201fe6c02",
                 "title": "Distribution of Events by Selected Access Service [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -1360,7 +1371,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -1372,7 +1384,7 @@
                 "panelIndex": "2d1c5d59-5ed0-4f44-b06a-23c9d1c7d166",
                 "title": "Distribution of Events by Authentication Identity Store [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -1464,7 +1476,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -1476,7 +1489,7 @@
                 "panelIndex": "12e6d367-bfc5-4a4c-966c-c73b389addd8",
                 "title": "Distribution of Radius Diagnostics by EAP Authentication [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -1568,7 +1581,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -1580,7 +1594,7 @@
                 "panelIndex": "0fa04ecb-2e18-44c7-802d-f600514bb4c1",
                 "title": "Distribution of Radius Diagnostics by EAP Tunnel [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -1666,7 +1680,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -1678,7 +1693,7 @@
                 "panelIndex": "d5d83248-e10f-483a-91d2-ccf55af44df9",
                 "title": "Top 10 Portal Name [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -1701,12 +1716,10 @@
         "title": "[Logs Cisco ISE] AAA Diagnostics",
         "version": 1
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:09:01.185Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.344Z",
     "id": "cisco_ise-506e8200-39a5-11ed-a2b2-1d4b9d412e28",
-    "migrationVersion": {
-        "dashboard": "8.7.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
@@ -1872,7 +1885,13 @@
             "id": "cisco_ise-39e47010-a09b-11ec-a0a2-1598702abf83",
             "name": "941178b6-0625-45d3-a262-f91b3eb03e7d:panel_941178b6-0625-45d3-a262-f91b3eb03e7d",
             "type": "search"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "dashboard"
+    "type": "dashboard",
+    "typeMigrationVersion": "8.9.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/dashboard/cisco_ise-6b611af0-39a0-11ed-a2b2-1d4b9d412e28.json b/packages/cisco_ise/kibana/dashboard/cisco_ise-6b611af0-39a0-11ed-a2b2-1d4b9d412e28.json
index d20e2d540b6..d99beb3df3e 100644
--- a/packages/cisco_ise/kibana/dashboard/cisco_ise-6b611af0-39a0-11ed-a2b2-1d4b9d412e28.json
+++ b/packages/cisco_ise/kibana/dashboard/cisco_ise-6b611af0-39a0-11ed-a2b2-1d4b9d412e28.json
@@ -200,7 +200,8 @@
                         "visualizationType": "lnsXY"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -212,7 +213,7 @@
                 "panelIndex": "14ac8bca-763d-41c2-8fff-843cd7c5817a",
                 "title": "CPU Utilization Over Time [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -353,7 +354,8 @@
                         "visualizationType": "lnsXY"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -365,7 +367,7 @@
                 "panelIndex": "087dcbdb-58fd-4e23-b12c-6060ae0468f6",
                 "title": "Memory Utilization Over Time [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -506,7 +508,8 @@
                         "visualizationType": "lnsXY"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -518,7 +521,7 @@
                 "panelIndex": "8c910460-7045-47cf-a8d1-35ef79792905",
                 "title": "Utilization Load Average Over Time [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -659,7 +662,8 @@
                         "visualizationType": "lnsXY"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -671,19 +675,17 @@
                 "panelIndex": "acb4f4d1-400f-45c3-8a38-4b213b8e81bb",
                 "title": "Disk IO Utilization Over Time [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             }
         ],
         "timeRestore": false,
         "title": "[Logs Cisco ISE] System Statistics",
         "version": 1
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:16:39.147Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.344Z",
     "id": "cisco_ise-6b611af0-39a0-11ed-a2b2-1d4b9d412e28",
-    "migrationVersion": {
-        "dashboard": "8.7.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
@@ -734,7 +736,13 @@
             "id": "logs-*",
             "name": "acb4f4d1-400f-45c3-8a38-4b213b8e81bb:953d98df-84d0-4692-bb49-d52418d906f1",
             "type": "index-pattern"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "dashboard"
+    "type": "dashboard",
+    "typeMigrationVersion": "8.9.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/dashboard/cisco_ise-a42bdb60-39a8-11ed-a2b2-1d4b9d412e28.json b/packages/cisco_ise/kibana/dashboard/cisco_ise-a42bdb60-39a8-11ed-a2b2-1d4b9d412e28.json
index 749f24cb1e1..23b6f1dc7df 100644
--- a/packages/cisco_ise/kibana/dashboard/cisco_ise-a42bdb60-39a8-11ed-a2b2-1d4b9d412e28.json
+++ b/packages/cisco_ise/kibana/dashboard/cisco_ise-a42bdb60-39a8-11ed-a2b2-1d4b9d412e28.json
@@ -164,7 +164,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -176,7 +177,7 @@
                 "panelIndex": "50fe0c8b-d5fe-4d19-b498-888c02bb97e6",
                 "title": "Distribution of Radius Accounting by Accounting Terminate Cause [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -268,7 +269,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -280,7 +282,7 @@
                 "panelIndex": "90f9a95f-9551-416e-a3b6-1cd887f18b7f",
                 "title": "Distribution of Radius Accounting by NAS Port Type [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -366,7 +368,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -378,7 +381,7 @@
                 "panelIndex": "c1d5ee32-f14a-467c-96de-ef0c3f16e9bc",
                 "title": "Top 10 NAS IP Address for Radius Accounting [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -464,7 +467,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -476,7 +480,7 @@
                 "panelIndex": "65b5737b-cfa1-4bab-becf-871781ac7034",
                 "title": "Top 10 Device IP Address for Accounting [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -562,7 +566,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -574,7 +579,7 @@
                 "panelIndex": "8f672ac4-133d-437d-8c0d-b2c2141ee692",
                 "title": "Top 10 Network Device Name for Accounting [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -660,7 +665,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -672,7 +678,7 @@
                 "panelIndex": "5a56a74f-79be-46e1-881e-ff2f30f92833",
                 "title": "Top 10 User Name for Accounting [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -758,7 +764,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -770,7 +777,7 @@
                 "panelIndex": "21639b0e-d284-47d6-b11e-c385c2766732",
                 "title": "Top 10 Network Device Profile for TACACS Accounting [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -862,7 +869,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -874,7 +882,7 @@
                 "panelIndex": "eb724ae2-4f92-4319-89ed-7009423508f9",
                 "title": "Distribution of Events by Selected Access Service for Accounting [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -960,7 +968,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -972,7 +981,7 @@
                 "panelIndex": "63c391d6-91af-41b4-89f5-425154ed3687",
                 "title": "Top 10 Service for TACACS Accounting [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -995,12 +1004,10 @@
         "title": "[Logs Cisco ISE] Accounting",
         "version": 1
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:09:01.185Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.344Z",
     "id": "cisco_ise-a42bdb60-39a8-11ed-a2b2-1d4b9d412e28",
-    "migrationVersion": {
-        "dashboard": "8.7.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
@@ -1106,7 +1113,13 @@
             "id": "cisco_ise-f681d1f0-a09f-11ec-a0a2-1598702abf83",
             "name": "66b5e5d7-8e6f-4064-8eca-695c6dc79f54:panel_66b5e5d7-8e6f-4064-8eca-695c6dc79f54",
             "type": "search"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "dashboard"
+    "type": "dashboard",
+    "typeMigrationVersion": "8.9.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/dashboard/cisco_ise-db12cdf0-3a2f-11ed-a2b2-1d4b9d412e28.json b/packages/cisco_ise/kibana/dashboard/cisco_ise-db12cdf0-3a2f-11ed-a2b2-1d4b9d412e28.json
index 7fd10a4b5a5..f93f3372b41 100644
--- a/packages/cisco_ise/kibana/dashboard/cisco_ise-db12cdf0-3a2f-11ed-a2b2-1d4b9d412e28.json
+++ b/packages/cisco_ise/kibana/dashboard/cisco_ise-db12cdf0-3a2f-11ed-a2b2-1d4b9d412e28.json
@@ -180,7 +180,8 @@
                         "visualizationType": "lnsXY"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -192,7 +193,7 @@
                 "panelIndex": "8c19e09b-09cb-440b-b454-aa4a8d9e7880",
                 "title": "Distribution of Events by Admin Interface [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -278,7 +279,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -290,7 +292,7 @@
                 "panelIndex": "f9dd11ba-12c4-442b-aa3d-cbe677207a5b",
                 "title": "Top 10 Client IP for Administrative and Operational Audit [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -382,7 +384,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -394,7 +397,7 @@
                 "panelIndex": "5b20193e-ed7e-4ba9-939e-34491c9cc579",
                 "title": "Distribution of Events by Object Type [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -486,7 +489,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -498,7 +502,7 @@
                 "panelIndex": "182d5879-ad21-444d-be4b-a9cacc85f32a",
                 "title": " Distribution of Events by Failure Flag [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -606,7 +610,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -618,19 +623,17 @@
                 "panelIndex": "869e8f53-9621-4d73-accb-f98ddf4074c8",
                 "title": "Distribution of Events by Admin Name [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             }
         ],
         "timeRestore": false,
         "title": "[Logs Cisco ISE] Administrative and Operational Audit",
         "version": 1
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:09:01.185Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.344Z",
     "id": "cisco_ise-db12cdf0-3a2f-11ed-a2b2-1d4b9d412e28",
-    "migrationVersion": {
-        "dashboard": "8.7.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
@@ -696,7 +699,13 @@
             "id": "logs-*",
             "name": "869e8f53-9621-4d73-accb-f98ddf4074c8:indexpattern-datasource-layer-7bf1fa13-c8a5-4275-894f-6dfe27b219a9",
             "type": "index-pattern"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "dashboard"
+    "type": "dashboard",
+    "typeMigrationVersion": "8.9.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/dashboard/cisco_ise-e0ca7fa0-398e-11ed-bb16-3b8b6259e7b8.json b/packages/cisco_ise/kibana/dashboard/cisco_ise-e0ca7fa0-398e-11ed-bb16-3b8b6259e7b8.json
index cdf38cc52ba..d6bc6544e08 100644
--- a/packages/cisco_ise/kibana/dashboard/cisco_ise-e0ca7fa0-398e-11ed-bb16-3b8b6259e7b8.json
+++ b/packages/cisco_ise/kibana/dashboard/cisco_ise-e0ca7fa0-398e-11ed-bb16-3b8b6259e7b8.json
@@ -164,7 +164,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -176,7 +177,7 @@
                 "panelIndex": "85437a40-e6a9-489e-ac32-58cadd0634b8",
                 "title": "Distribution of Threat Centric NAC by Connectivity [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -268,7 +269,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -280,7 +282,7 @@
                 "panelIndex": "1b366a1b-c4e9-43b6-b789-b5baafd5072a",
                 "title": "Distribution of Threat Centric NAC by Status [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -366,7 +368,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -378,7 +381,7 @@
                 "panelIndex": "fba9ea1e-6a7f-42c0-9008-ce0304be7c91",
                 "title": "Top 10 Logger Name [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -464,7 +467,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -476,7 +480,7 @@
                 "panelIndex": "e3321d37-b59c-4e5f-a4fc-07b0997bd550",
                 "title": "Top 10 Adapter Instance Name for Threat Centric NAC [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -519,12 +523,10 @@
         "title": "[Logs Cisco ISE] System Diagnostics",
         "version": 1
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:09:01.185Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.344Z",
     "id": "cisco_ise-e0ca7fa0-398e-11ed-bb16-3b8b6259e7b8",
-    "migrationVersion": {
-        "dashboard": "8.7.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
@@ -585,7 +587,13 @@
             "id": "cisco_ise-eecf4510-a058-11ec-a0a2-1598702abf83",
             "name": "63d82580-d104-4814-ad43-6b70f6541028:panel_63d82580-d104-4814-ad43-6b70f6541028",
             "type": "search"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "dashboard"
+    "type": "dashboard",
+    "typeMigrationVersion": "8.9.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/dashboard/cisco_ise-e2146a20-39a1-11ed-a2b2-1d4b9d412e28.json b/packages/cisco_ise/kibana/dashboard/cisco_ise-e2146a20-39a1-11ed-a2b2-1d4b9d412e28.json
index ca1444cac1e..6addcf925a5 100644
--- a/packages/cisco_ise/kibana/dashboard/cisco_ise-e2146a20-39a1-11ed-a2b2-1d4b9d412e28.json
+++ b/packages/cisco_ise/kibana/dashboard/cisco_ise-e2146a20-39a1-11ed-a2b2-1d4b9d412e28.json
@@ -158,7 +158,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -170,7 +171,7 @@
                 "panelIndex": "254a55c0-27d8-4f54-8741-330c1f4e525b",
                 "title": "Top 10 Device IP Address [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -262,7 +263,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -274,7 +276,7 @@
                 "panelIndex": "daa7cb0d-8d92-4a05-adab-1b16ccd0b575",
                 "title": "Distribution of Events by Protocol [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -360,7 +362,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 13,
@@ -372,7 +375,7 @@
                 "panelIndex": "5d39617f-20fa-4cb5-b3ed-295affaadca3",
                 "title": "Top 10 Network Device Names [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -458,7 +461,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 13,
@@ -470,7 +474,7 @@
                 "panelIndex": "d8d363bc-a50d-4238-b542-cda9a8bddcd4",
                 "title": "Top 10 User Name [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -556,7 +560,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 13,
@@ -568,7 +573,7 @@
                 "panelIndex": "e711c9fa-d158-48c8-99dc-2dc6703dbabf",
                 "title": "Top 10 Portals Used [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -689,7 +694,8 @@
                         "visualizationType": "lnsXY"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -701,7 +707,7 @@
                 "panelIndex": "f92869f3-3a35-4efa-8f6e-a2ba8896dd27",
                 "title": "Top 10 Network Device Names [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -793,7 +799,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -805,7 +812,7 @@
                 "panelIndex": "67b7e285-113f-4c6e-b79e-79de155098b9",
                 "title": "Distribution of Events by Authentication Method [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -926,7 +933,8 @@
                         "visualizationType": "lnsXY"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -938,7 +946,7 @@
                 "panelIndex": "2f39e323-b44a-4a44-93ad-71d7b63c0b1b",
                 "title": "Distribution of Events by NAS Port Type [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -1030,7 +1038,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -1042,7 +1051,7 @@
                 "panelIndex": "91450c82-49a1-4468-be27-3daa5988de88",
                 "title": " Distribution of Events by User Type [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -1134,7 +1143,8 @@
                         "visualizationType": "lnsPie"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -1146,7 +1156,7 @@
                 "panelIndex": "fc94de3e-4ac3-441b-991c-4d494551f38c",
                 "title": "Distribution of Events by Model Name [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -1232,7 +1242,8 @@
                         "visualizationType": "lnsDatatable"
                     },
                     "enhancements": {},
-                    "hidePanelTitles": false
+                    "hidePanelTitles": false,
+                    "type": "lens"
                 },
                 "gridData": {
                     "h": 15,
@@ -1244,7 +1255,7 @@
                 "panelIndex": "74561758-6b16-4f7f-89be-db484655474a",
                 "title": "Top 10 Network Device Profile Name [Logs Cisco ISE]",
                 "type": "lens",
-                "version": "8.7.1"
+                "version": "8.9.0"
             },
             {
                 "embeddableConfig": {
@@ -1269,12 +1280,10 @@
         "title": "[Logs Cisco ISE] AAA Audit",
         "version": 1
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:09:01.185Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.344Z",
     "id": "cisco_ise-e2146a20-39a1-11ed-a2b2-1d4b9d412e28",
-    "migrationVersion": {
-        "dashboard": "8.7.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
@@ -1400,7 +1409,13 @@
             "id": "cisco_ise-d1ba7b80-a075-11ec-a0a2-1598702abf83",
             "name": "98e1946c-4133-4ac5-b39e-2204f66d9740:panel_98e1946c-4133-4ac5-b39e-2204f66d9740",
             "type": "search"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "dashboard"
+    "type": "dashboard",
+    "typeMigrationVersion": "8.9.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/dashboard/cisco_ise-fcb9bc40-3a32-11ed-a2b2-1d4b9d412e28.json b/packages/cisco_ise/kibana/dashboard/cisco_ise-fcb9bc40-3a32-11ed-a2b2-1d4b9d412e28.json
index b7db9b8b9fd..8e953c391fd 100644
--- a/packages/cisco_ise/kibana/dashboard/cisco_ise-fcb9bc40-3a32-11ed-a2b2-1d4b9d412e28.json
+++ b/packages/cisco_ise/kibana/dashboard/cisco_ise-fcb9bc40-3a32-11ed-a2b2-1d4b9d412e28.json
@@ -108,47 +108,115 @@
                 },
                 "panelIndex": "4eff54a3-58b0-4003-b7ea-bed6a32f3696",
                 "title": "Controls [Logs Cisco ISE]",
-                "type": "visualization",
-                "version": "8.7.1"
+                "type": "visualization"
             },
             {
                 "embeddableConfig": {
-                    "enhancements": {},
-                    "hidePanelTitles": false,
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {
-                                "filter": [],
-                                "query": {
-                                    "language": "kuery",
-                                    "query": ""
-                                }
+                    "attributes": {
+                        "layout": "vertical",
+                        "links": [
+                            {
+                                "destinationRefName": "link_a4d5f11f-0cdd-4927-9114-13a34167194f_dashboard",
+                                "id": "a4d5f11f-0cdd-4927-9114-13a34167194f",
+                                "label": "AAA Audit",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 0,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_ae3ea02b-f784-425a-ae09-7695dda9b174_dashboard",
+                                "id": "ae3ea02b-f784-425a-ae09-7695dda9b174",
+                                "label": "AAA Diagnostics",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 1,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_055437da-bbf5-4dac-9f4a-1bfc3c691500_dashboard",
+                                "id": "055437da-bbf5-4dac-9f4a-1bfc3c691500",
+                                "label": "Accounting",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 2,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_240b51a0-1c0c-4cf8-8d86-9421683d772b_dashboard",
+                                "id": "240b51a0-1c0c-4cf8-8d86-9421683d772b",
+                                "label": "Administrative and Operational Audit",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 3,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_51761e5a-60cc-4e4f-9dc7-f8239a69a726_dashboard",
+                                "id": "51761e5a-60cc-4e4f-9dc7-f8239a69a726",
+                                "label": "Posture and Client Provisioning Audit",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 4,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_048e9ebe-fd70-44e1-bc56-2004de91bf73_dashboard",
+                                "id": "048e9ebe-fd70-44e1-bc56-2004de91bf73",
+                                "label": "System Diagnostics",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 5,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_e80e9dbb-3458-4dd8-824c-0c6aeb0873b6_dashboard",
+                                "id": "e80e9dbb-3458-4dd8-824c-0c6aeb0873b6",
+                                "label": "System Statistics",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 6,
+                                "type": "dashboardLink"
                             }
-                        },
-                        "description": "",
-                        "id": "",
-                        "params": {
-                            "fontSize": 12,
-                            "markdown": "**[AAA Audit](\u003c#/dashboard/cisco_ise-e2146a20-39a1-11ed-a2b2-1d4b9d412e28\u003e)**\n\n**[AAA Diagnostics](\u003c#/dashboard/cisco_ise-506e8200-39a5-11ed-a2b2-1d4b9d412e28\u003e)**\n\n**[Accounting](\u003c#/dashboard/cisco_ise-a42bdb60-39a8-11ed-a2b2-1d4b9d412e28\u003e)**\n\n**[Administrative and Operational Audit](\u003c#/dashboard/cisco_ise-db12cdf0-3a2f-11ed-a2b2-1d4b9d412e28\u003e)**\n\n**[Posture and Client Provisioning Audit](\u003c#/dashboard/cisco_ise-44afda90-3991-11ed-bb16-3b8b6259e7b8\u003e)**\n\n**[System Diagnostics](\u003c#/dashboard/cisco_ise-e0ca7fa0-398e-11ed-bb16-3b8b6259e7b8\u003e)**\n\n**[System Statistics](\u003c#/dashboard/cisco_ise-6b611af0-39a0-11ed-a2b2-1d4b9d412e28\u003e)**",
-                            "openLinksInNewTab": false
-                        },
-                        "title": "",
-                        "type": "markdown",
-                        "uiState": {}
-                    }
+                        ]
+                    },
+                    "disabledActions": [
+                        "OPEN_FLYOUT_ADD_DRILLDOWN"
+                    ],
+                    "enhancements": {},
+                    "hidePanelTitles": false
                 },
                 "gridData": {
                     "h": 15,
-                    "i": "684cf597-c500-4d7a-90d1-445345cd823c",
+                    "i": "615fd9e8-fab7-44fe-8e1f-f7ae2347ab4b",
                     "w": 24,
                     "x": 24,
                     "y": 0
                 },
-                "panelIndex": "684cf597-c500-4d7a-90d1-445345cd823c",
+                "panelIndex": "615fd9e8-fab7-44fe-8e1f-f7ae2347ab4b",
                 "title": "Dashboards [Logs Cisco ISE]",
-                "type": "visualization",
-                "version": "8.7.1"
+                "type": "links"
             },
             {
                 "embeddableConfig": {
@@ -163,20 +231,17 @@
                 },
                 "panelIndex": "bc9e69e8-6c0b-4a88-9427-5ce49965edc9",
                 "panelRefName": "panel_bc9e69e8-6c0b-4a88-9427-5ce49965edc9",
-                "type": "search",
-                "version": "8.7.1"
+                "type": "search"
             }
         ],
         "timeRestore": false,
         "title": "[Logs Cisco ISE] Cisco ISE Overview",
         "version": 1
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:09:01.185Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:17:42.544Z",
     "id": "cisco_ise-fcb9bc40-3a32-11ed-a2b2-1d4b9d412e28",
-    "migrationVersion": {
-        "dashboard": "8.7.0"
-    },
+    "managed": false,
     "references": [
         {
             "id": "logs-*",
@@ -193,11 +258,52 @@
             "name": "4eff54a3-58b0-4003-b7ea-bed6a32f3696:control_4eff54a3-58b0-4003-b7ea-bed6a32f3696_1_index_pattern",
             "type": "index-pattern"
         },
+        {
+            "id": "cisco_ise-e2146a20-39a1-11ed-a2b2-1d4b9d412e28",
+            "name": "615fd9e8-fab7-44fe-8e1f-f7ae2347ab4b:link_a4d5f11f-0cdd-4927-9114-13a34167194f_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "cisco_ise-506e8200-39a5-11ed-a2b2-1d4b9d412e28",
+            "name": "615fd9e8-fab7-44fe-8e1f-f7ae2347ab4b:link_ae3ea02b-f784-425a-ae09-7695dda9b174_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "cisco_ise-a42bdb60-39a8-11ed-a2b2-1d4b9d412e28",
+            "name": "615fd9e8-fab7-44fe-8e1f-f7ae2347ab4b:link_055437da-bbf5-4dac-9f4a-1bfc3c691500_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "cisco_ise-db12cdf0-3a2f-11ed-a2b2-1d4b9d412e28",
+            "name": "615fd9e8-fab7-44fe-8e1f-f7ae2347ab4b:link_240b51a0-1c0c-4cf8-8d86-9421683d772b_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "cisco_ise-44afda90-3991-11ed-bb16-3b8b6259e7b8",
+            "name": "615fd9e8-fab7-44fe-8e1f-f7ae2347ab4b:link_51761e5a-60cc-4e4f-9dc7-f8239a69a726_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "cisco_ise-e0ca7fa0-398e-11ed-bb16-3b8b6259e7b8",
+            "name": "615fd9e8-fab7-44fe-8e1f-f7ae2347ab4b:link_048e9ebe-fd70-44e1-bc56-2004de91bf73_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "cisco_ise-6b611af0-39a0-11ed-a2b2-1d4b9d412e28",
+            "name": "615fd9e8-fab7-44fe-8e1f-f7ae2347ab4b:link_e80e9dbb-3458-4dd8-824c-0c6aeb0873b6_dashboard",
+            "type": "dashboard"
+        },
         {
             "id": "cisco_ise-5f739b70-a0a6-11ec-a0a2-1598702abf83",
             "name": "bc9e69e8-6c0b-4a88-9427-5ce49965edc9:panel_bc9e69e8-6c0b-4a88-9427-5ce49965edc9",
             "type": "search"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "dashboard"
+    "type": "dashboard",
+    "typeMigrationVersion": "8.9.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/search/cisco_ise-2c7c0eb0-a505-11ec-ab9d-4b8e737a22d9.json b/packages/cisco_ise/kibana/search/cisco_ise-2c7c0eb0-a505-11ec-ab9d-4b8e737a22d9.json
index 75f1fcdc50c..3b1d7d75550 100644
--- a/packages/cisco_ise/kibana/search/cisco_ise-2c7c0eb0-a505-11ec-ab9d-4b8e737a22d9.json
+++ b/packages/cisco_ise/kibana/search/cisco_ise-2c7c0eb0-a505-11ec-ab9d-4b8e737a22d9.json
@@ -25,18 +25,22 @@
         ],
         "title": "System Diagnostics Search 1"
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:09:01.185Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.344Z",
     "id": "cisco_ise-2c7c0eb0-a505-11ec-ab9d-4b8e737a22d9",
-    "migrationVersion": {
-        "search": "8.0.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
             "type": "index-pattern"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "search"
+    "type": "search",
+    "typeMigrationVersion": "8.0.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/search/cisco_ise-39e47010-a09b-11ec-a0a2-1598702abf83.json b/packages/cisco_ise/kibana/search/cisco_ise-39e47010-a09b-11ec-a0a2-1598702abf83.json
index 838157f84d4..2289843be63 100644
--- a/packages/cisco_ise/kibana/search/cisco_ise-39e47010-a09b-11ec-a0a2-1598702abf83.json
+++ b/packages/cisco_ise/kibana/search/cisco_ise-39e47010-a09b-11ec-a0a2-1598702abf83.json
@@ -25,18 +25,22 @@
         ],
         "title": "AAA Diagnostics Log Stream [Logs Cisco ISE]"
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:09:01.185Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.344Z",
     "id": "cisco_ise-39e47010-a09b-11ec-a0a2-1598702abf83",
-    "migrationVersion": {
-        "search": "8.0.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
             "type": "index-pattern"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "search"
+    "type": "search",
+    "typeMigrationVersion": "8.0.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/search/cisco_ise-47c77dc0-a065-11ec-a0a2-1598702abf83.json b/packages/cisco_ise/kibana/search/cisco_ise-47c77dc0-a065-11ec-a0a2-1598702abf83.json
index 2eea46f4bfd..b40770025e6 100644
--- a/packages/cisco_ise/kibana/search/cisco_ise-47c77dc0-a065-11ec-a0a2-1598702abf83.json
+++ b/packages/cisco_ise/kibana/search/cisco_ise-47c77dc0-a065-11ec-a0a2-1598702abf83.json
@@ -26,18 +26,22 @@
         ],
         "title": "Posture and Client Provisioning Audit search"
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:09:01.185Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.344Z",
     "id": "cisco_ise-47c77dc0-a065-11ec-a0a2-1598702abf83",
-    "migrationVersion": {
-        "search": "8.0.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
             "type": "index-pattern"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "search"
+    "type": "search",
+    "typeMigrationVersion": "8.0.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/search/cisco_ise-5f739b70-a0a6-11ec-a0a2-1598702abf83.json b/packages/cisco_ise/kibana/search/cisco_ise-5f739b70-a0a6-11ec-a0a2-1598702abf83.json
index e20fabf5bbf..ca47d47300d 100644
--- a/packages/cisco_ise/kibana/search/cisco_ise-5f739b70-a0a6-11ec-a0a2-1598702abf83.json
+++ b/packages/cisco_ise/kibana/search/cisco_ise-5f739b70-a0a6-11ec-a0a2-1598702abf83.json
@@ -28,18 +28,22 @@
         ],
         "title": "Log Stream [Logs Cisco ISE]"
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:09:01.185Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.344Z",
     "id": "cisco_ise-5f739b70-a0a6-11ec-a0a2-1598702abf83",
-    "migrationVersion": {
-        "search": "8.0.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
             "type": "index-pattern"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "search"
+    "type": "search",
+    "typeMigrationVersion": "8.0.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/search/cisco_ise-ac5b9ba0-a02d-11ec-a0a2-1598702abf83.json b/packages/cisco_ise/kibana/search/cisco_ise-ac5b9ba0-a02d-11ec-a0a2-1598702abf83.json
index 0886de1fa18..feb5f36730d 100644
--- a/packages/cisco_ise/kibana/search/cisco_ise-ac5b9ba0-a02d-11ec-a0a2-1598702abf83.json
+++ b/packages/cisco_ise/kibana/search/cisco_ise-ac5b9ba0-a02d-11ec-a0a2-1598702abf83.json
@@ -25,18 +25,22 @@
         ],
         "title": "Administrative and Operational Audit Log Stream [Logs Cisco ISE]"
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:09:01.185Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.344Z",
     "id": "cisco_ise-ac5b9ba0-a02d-11ec-a0a2-1598702abf83",
-    "migrationVersion": {
-        "search": "8.0.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
             "type": "index-pattern"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "search"
+    "type": "search",
+    "typeMigrationVersion": "8.0.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/search/cisco_ise-d1ba7b80-a075-11ec-a0a2-1598702abf83.json b/packages/cisco_ise/kibana/search/cisco_ise-d1ba7b80-a075-11ec-a0a2-1598702abf83.json
index a3ee8f19d43..bd2facedff1 100644
--- a/packages/cisco_ise/kibana/search/cisco_ise-d1ba7b80-a075-11ec-a0a2-1598702abf83.json
+++ b/packages/cisco_ise/kibana/search/cisco_ise-d1ba7b80-a075-11ec-a0a2-1598702abf83.json
@@ -27,18 +27,22 @@
         ],
         "title": "AAA Audit Log Stream [Logs Cisco ISE]"
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:09:01.185Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.344Z",
     "id": "cisco_ise-d1ba7b80-a075-11ec-a0a2-1598702abf83",
-    "migrationVersion": {
-        "search": "8.0.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
             "type": "index-pattern"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "search"
+    "type": "search",
+    "typeMigrationVersion": "8.0.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/search/cisco_ise-eecf4510-a058-11ec-a0a2-1598702abf83.json b/packages/cisco_ise/kibana/search/cisco_ise-eecf4510-a058-11ec-a0a2-1598702abf83.json
index fe6ee25d16a..ee61019066c 100644
--- a/packages/cisco_ise/kibana/search/cisco_ise-eecf4510-a058-11ec-a0a2-1598702abf83.json
+++ b/packages/cisco_ise/kibana/search/cisco_ise-eecf4510-a058-11ec-a0a2-1598702abf83.json
@@ -26,18 +26,22 @@
         ],
         "title": "System Diagnostics search 2"
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:09:01.185Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.344Z",
     "id": "cisco_ise-eecf4510-a058-11ec-a0a2-1598702abf83",
-    "migrationVersion": {
-        "search": "8.0.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
             "type": "index-pattern"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "search"
+    "type": "search",
+    "typeMigrationVersion": "8.0.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/search/cisco_ise-f681d1f0-a09f-11ec-a0a2-1598702abf83.json b/packages/cisco_ise/kibana/search/cisco_ise-f681d1f0-a09f-11ec-a0a2-1598702abf83.json
index af63bd99868..c971a2b9b6c 100644
--- a/packages/cisco_ise/kibana/search/cisco_ise-f681d1f0-a09f-11ec-a0a2-1598702abf83.json
+++ b/packages/cisco_ise/kibana/search/cisco_ise-f681d1f0-a09f-11ec-a0a2-1598702abf83.json
@@ -25,18 +25,22 @@
         ],
         "title": "Accounting Log Stream [Logs Cisco ISE]"
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-04T07:09:01.185Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.344Z",
     "id": "cisco_ise-f681d1f0-a09f-11ec-a0a2-1598702abf83",
-    "migrationVersion": {
-        "search": "8.0.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
             "type": "index-pattern"
+        },
+        {
+            "id": "cisco_ise-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "search"
+    "type": "search",
+    "typeMigrationVersion": "8.0.0"
 }
\ No newline at end of file
diff --git a/packages/cisco_ise/kibana/tag/cisco_ise-security-solution-default.json b/packages/cisco_ise/kibana/tag/cisco_ise-security-solution-default.json
new file mode 100644
index 00000000000..c601fe69c2a
--- /dev/null
+++ b/packages/cisco_ise/kibana/tag/cisco_ise-security-solution-default.json
@@ -0,0 +1,14 @@
+{
+    "attributes": {
+        "color": "#FEC514",
+        "description": "Tag defined in package-spec",
+        "name": "Security Solution"
+    },
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:13:04.402Z",
+    "id": "cisco_ise-security-solution-default",
+    "managed": false,
+    "references": [],
+    "type": "tag",
+    "typeMigrationVersion": "8.0.0"
+}
\ No newline at end of file
diff --git a/packages/cisco_ise/manifest.yml b/packages/cisco_ise/manifest.yml
index 68166151bbe..496afbdc2f5 100644
--- a/packages/cisco_ise/manifest.yml
+++ b/packages/cisco_ise/manifest.yml
@@ -1,7 +1,7 @@
 format_version: "3.0.3"
 name: cisco_ise
 title: Cisco ISE
-version: "1.28.1"
+version: "1.29.0"
 description: Collect logs from Cisco ISE with Elastic Agent.
 type: integration
 categories:
diff --git a/packages/fortinet_fortimail/changelog.yml b/packages/fortinet_fortimail/changelog.yml
index 1f1893e39c5..f5943ff5387 100644
--- a/packages/fortinet_fortimail/changelog.yml
+++ b/packages/fortinet_fortimail/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "2.16.0"
+  changes:
+    - description: Replace navigation with links panels. Updated support for kibana version to 8.11.0 and above.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/14938
 - version: "2.15.1"
   changes:
     - description: Changed owners.
diff --git a/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-8adfeca0-a942-11ed-8ba6-130117898d4a.json b/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-8adfeca0-a942-11ed-8ba6-130117898d4a.json
index 3127c93fe6b..dcc4ff10b2b 100644
--- a/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-8adfeca0-a942-11ed-8ba6-130117898d4a.json
+++ b/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-8adfeca0-a942-11ed-8ba6-130117898d4a.json
@@ -1,7 +1,6 @@
 {
     "attributes": {
         "description": "Overview of Fortinet FortiMail Antispam, Antivirus \u0026 Encryption Events.",
-        "hits": 0,
         "kibanaSavedObjectMeta": {
             "searchSourceJSON": {
                 "filter": [
@@ -76,45 +75,70 @@
         "optionsJSON": {
             "hidePanelTitles": false,
             "syncColors": false,
+            "syncCursor": true,
+            "syncTooltips": false,
             "useMargins": true
         },
         "panelsJSON": [
             {
                 "embeddableConfig": {
-                    "enhancements": {},
-                    "hidePanelTitles": true,
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {
-                                "filter": [],
-                                "query": {
-                                    "language": "kuery",
-                                    "query": ""
-                                }
+                    "attributes": {
+                        "layout": "horizontal",
+                        "links": [
+                            {
+                                "destinationRefName": "link_90449cbf-1ed3-4ac4-a73e-26aec8ee9cb9_dashboard",
+                                "id": "90449cbf-1ed3-4ac4-a73e-26aec8ee9cb9",
+                                "label": "History",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 0,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_874709b1-32b2-4064-9ee6-d3bade02b54c_dashboard",
+                                "id": "874709b1-32b2-4064-9ee6-d3bade02b54c",
+                                "label": "System",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 1,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_887caeb4-699d-446e-9127-c9eb9b588699_dashboard",
+                                "id": "887caeb4-699d-446e-9127-c9eb9b588699",
+                                "label": "Email",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 2,
+                                "type": "dashboardLink"
                             }
-                        },
-                        "description": "",
-                        "params": {
-                            "fontSize": 12,
-                            "markdown": "[History](#/dashboard/fortinet_fortimail-f352d950-a870-11ed-8ba6-130117898d4a) | [System](#/dashboard/fortinet_fortimail-d5803cc0-a937-11ed-8ba6-130117898d4a) | [Email](#/dashboard/fortinet_fortimail-c4b7f4d0-a93e-11ed-8ba6-130117898d4a)",
-                            "openLinksInNewTab": false
-                        },
-                        "title": "",
-                        "type": "markdown",
-                        "uiState": {}
-                    }
+                        ]
+                    },
+                    "disabledActions": [
+                        "OPEN_FLYOUT_ADD_DRILLDOWN"
+                    ],
+                    "enhancements": {},
+                    "hidePanelTitles": false
                 },
                 "gridData": {
-                    "h": 2,
-                    "i": "8e04ab8a-bd99-4ed2-9ce5-14f67831c865",
+                    "h": 3,
+                    "i": "b29de93d-3d5c-4c6e-afb4-e0ac75fa39cf",
                     "w": 48,
                     "x": 0,
                     "y": 0
                 },
-                "panelIndex": "8e04ab8a-bd99-4ed2-9ce5-14f67831c865",
-                "type": "visualization",
-                "version": "8.3.0"
+                "panelIndex": "b29de93d-3d5c-4c6e-afb4-e0ac75fa39cf",
+                "title": "Navigation",
+                "type": "links"
             },
             {
                 "embeddableConfig": {
@@ -144,15 +168,14 @@
                     }
                 },
                 "gridData": {
-                    "h": 3,
+                    "h": 4,
                     "i": "2c93d318-669e-4536-ad5a-be1400ec1a75",
                     "w": 48,
                     "x": 0,
-                    "y": 2
+                    "y": 3
                 },
                 "panelIndex": "2c93d318-669e-4536-ad5a-be1400ec1a75",
-                "type": "visualization",
-                "version": "8.3.0"
+                "type": "visualization"
             },
             {
                 "embeddableConfig": {
@@ -171,7 +194,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "91f29ea2-28fa-4a3f-87a8-bda18acaf98a": {
                                             "columnOrder": [
@@ -244,16 +267,18 @@
                                 "layers": [
                                     {
                                         "categoryDisplay": "default",
-                                        "groups": [
-                                            "d465f273-9a8f-4a08-8b84-d9adfc344edf"
-                                        ],
                                         "layerId": "91f29ea2-28fa-4a3f-87a8-bda18acaf98a",
                                         "layerType": "data",
                                         "legendDisplay": "default",
                                         "legendSize": "auto",
-                                        "metric": "c28b650a-89ee-41f5-b9e6-dce8a260b0b2",
+                                        "metrics": [
+                                            "c28b650a-89ee-41f5-b9e6-dce8a260b0b2"
+                                        ],
                                         "nestedLegend": false,
-                                        "numberDisplay": "percent"
+                                        "numberDisplay": "percent",
+                                        "primaryGroups": [
+                                            "d465f273-9a8f-4a08-8b84-d9adfc344edf"
+                                        ]
                                     }
                                 ],
                                 "shape": "pie"
@@ -271,12 +296,11 @@
                     "i": "daf9c218-a981-4dd1-9a2f-e0750a31c4fe",
                     "w": 24,
                     "x": 0,
-                    "y": 5
+                    "y": 7
                 },
                 "panelIndex": "daf9c218-a981-4dd1-9a2f-e0750a31c4fe",
                 "title": "Distribution of Antispam Events by Priority [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -295,7 +319,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "63b2f27f-538f-4e13-9356-eaf7ff4e1d25": {
                                             "columnOrder": [
@@ -417,12 +441,11 @@
                     "i": "716958c8-e162-4dcc-a35c-9c64b8aa4c9b",
                     "w": 24,
                     "x": 24,
-                    "y": 5
+                    "y": 7
                 },
                 "panelIndex": "716958c8-e162-4dcc-a35c-9c64b8aa4c9b",
                 "title": "Distribution of Antispam Events by Endpoint [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -451,16 +474,15 @@
                     }
                 },
                 "gridData": {
-                    "h": 3,
+                    "h": 4,
                     "i": "9cefee8d-73bf-404b-84b2-3ecd4731aabc",
                     "w": 48,
                     "x": 0,
-                    "y": 20
+                    "y": 22
                 },
                 "panelIndex": "9cefee8d-73bf-404b-84b2-3ecd4731aabc",
                 "title": "",
-                "type": "visualization",
-                "version": "8.3.0"
+                "type": "visualization"
             },
             {
                 "embeddableConfig": {
@@ -479,7 +501,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "e20a930b-10cf-4ce4-83e5-d1a85b1c0092": {
                                             "columnOrder": [
@@ -552,16 +574,18 @@
                                 "layers": [
                                     {
                                         "categoryDisplay": "default",
-                                        "groups": [
-                                            "385736f5-015b-4650-8271-827efa5aaaeb"
-                                        ],
                                         "layerId": "e20a930b-10cf-4ce4-83e5-d1a85b1c0092",
                                         "layerType": "data",
                                         "legendDisplay": "default",
                                         "legendSize": "auto",
-                                        "metric": "435997ba-5373-4703-bc76-ec743f541862",
+                                        "metrics": [
+                                            "435997ba-5373-4703-bc76-ec743f541862"
+                                        ],
                                         "nestedLegend": false,
-                                        "numberDisplay": "percent"
+                                        "numberDisplay": "percent",
+                                        "primaryGroups": [
+                                            "385736f5-015b-4650-8271-827efa5aaaeb"
+                                        ]
                                     }
                                 ],
                                 "shape": "pie"
@@ -579,12 +603,11 @@
                     "i": "40f3d3b0-e2a4-4cd4-b392-dda4f1d8ea0b",
                     "w": 24,
                     "x": 0,
-                    "y": 23
+                    "y": 26
                 },
                 "panelIndex": "40f3d3b0-e2a4-4cd4-b392-dda4f1d8ea0b",
                 "title": "Distribution of Antivirus Events by Subtype [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -603,7 +626,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "565da57f-35bb-47b8-8c6e-263acbe77e39": {
                                             "columnOrder": [
@@ -676,16 +699,18 @@
                                 "layers": [
                                     {
                                         "categoryDisplay": "default",
-                                        "groups": [
-                                            "9cbf4a97-4148-4236-a463-9ae746f33081"
-                                        ],
                                         "layerId": "565da57f-35bb-47b8-8c6e-263acbe77e39",
                                         "layerType": "data",
                                         "legendDisplay": "default",
                                         "legendSize": "auto",
-                                        "metric": "7436c1f0-af5b-4b00-ab40-2f18bd98ce6d",
+                                        "metrics": [
+                                            "7436c1f0-af5b-4b00-ab40-2f18bd98ce6d"
+                                        ],
                                         "nestedLegend": false,
-                                        "numberDisplay": "percent"
+                                        "numberDisplay": "percent",
+                                        "primaryGroups": [
+                                            "9cbf4a97-4148-4236-a463-9ae746f33081"
+                                        ]
                                     }
                                 ],
                                 "shape": "pie"
@@ -703,12 +728,11 @@
                     "i": "3d808a1e-729b-4079-b86a-bf461cab6b0d",
                     "w": 24,
                     "x": 24,
-                    "y": 23
+                    "y": 26
                 },
                 "panelIndex": "3d808a1e-729b-4079-b86a-bf461cab6b0d",
                 "title": "Distribution of Antivirus Events by Priority [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -737,16 +761,15 @@
                     }
                 },
                 "gridData": {
-                    "h": 3,
+                    "h": 4,
                     "i": "db623f0c-5a67-4d94-b45e-6e2d9d663ea3",
                     "w": 48,
                     "x": 0,
-                    "y": 38
+                    "y": 41
                 },
                 "panelIndex": "db623f0c-5a67-4d94-b45e-6e2d9d663ea3",
                 "title": "",
-                "type": "visualization",
-                "version": "8.3.0"
+                "type": "visualization"
             },
             {
                 "embeddableConfig": {
@@ -765,7 +788,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "6325af1a-d658-4a3e-a2df-0244e6a15a89": {
                                             "columnOrder": [
@@ -838,16 +861,18 @@
                                 "layers": [
                                     {
                                         "categoryDisplay": "default",
-                                        "groups": [
-                                            "b46016d7-33e0-4414-a0a1-d0d0095a9fce"
-                                        ],
                                         "layerId": "6325af1a-d658-4a3e-a2df-0244e6a15a89",
                                         "layerType": "data",
                                         "legendDisplay": "default",
                                         "legendSize": "auto",
-                                        "metric": "a7c86fa9-b63c-4c1d-bc5d-22b1f6e30043",
+                                        "metrics": [
+                                            "a7c86fa9-b63c-4c1d-bc5d-22b1f6e30043"
+                                        ],
                                         "nestedLegend": false,
-                                        "numberDisplay": "percent"
+                                        "numberDisplay": "percent",
+                                        "primaryGroups": [
+                                            "b46016d7-33e0-4414-a0a1-d0d0095a9fce"
+                                        ]
                                     }
                                 ],
                                 "shape": "pie"
@@ -865,23 +890,21 @@
                     "i": "59b4f09d-8960-4174-8232-0bde19e7ecf7",
                     "w": 24,
                     "x": 0,
-                    "y": 41
+                    "y": 45
                 },
                 "panelIndex": "59b4f09d-8960-4174-8232-0bde19e7ecf7",
                 "title": "Distribution of Encryption Events by Priority [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             }
         ],
         "timeRestore": false,
         "title": "[Logs Fortinet FortiMail] Antispam, Antivirus \u0026 Encryption",
         "version": 1
     },
-    "coreMigrationVersion": "8.3.0",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:35:26.296Z",
     "id": "fortinet_fortimail-8adfeca0-a942-11ed-8ba6-130117898d4a",
-    "migrationVersion": {
-        "dashboard": "8.3.0"
-    },
+    "managed": false,
     "references": [
         {
             "id": "logs-*",
@@ -893,6 +916,21 @@
             "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index",
             "type": "index-pattern"
         },
+        {
+            "id": "fortinet_fortimail-f352d950-a870-11ed-8ba6-130117898d4a",
+            "name": "b29de93d-3d5c-4c6e-afb4-e0ac75fa39cf:link_90449cbf-1ed3-4ac4-a73e-26aec8ee9cb9_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "fortinet_fortimail-d5803cc0-a937-11ed-8ba6-130117898d4a",
+            "name": "b29de93d-3d5c-4c6e-afb4-e0ac75fa39cf:link_874709b1-32b2-4064-9ee6-d3bade02b54c_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "fortinet_fortimail-c4b7f4d0-a93e-11ed-8ba6-130117898d4a",
+            "name": "b29de93d-3d5c-4c6e-afb4-e0ac75fa39cf:link_887caeb4-699d-446e-9127-c9eb9b588699_dashboard",
+            "type": "dashboard"
+        },
         {
             "id": "logs-*",
             "name": "daf9c218-a981-4dd1-9a2f-e0750a31c4fe:indexpattern-datasource-layer-91f29ea2-28fa-4a3f-87a8-bda18acaf98a",
@@ -942,7 +980,13 @@
             "id": "logs-*",
             "name": "59b4f09d-8960-4174-8232-0bde19e7ecf7:b323b805-60c3-4629-8d5e-989a6bca5302",
             "type": "index-pattern"
+        },
+        {
+            "id": "fortinet_fortimail-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "dashboard"
+    "type": "dashboard",
+    "typeMigrationVersion": "8.9.0"
 }
\ No newline at end of file
diff --git a/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-c4b7f4d0-a93e-11ed-8ba6-130117898d4a.json b/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-c4b7f4d0-a93e-11ed-8ba6-130117898d4a.json
index 3f59166999b..303c84dbcc3 100644
--- a/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-c4b7f4d0-a93e-11ed-8ba6-130117898d4a.json
+++ b/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-c4b7f4d0-a93e-11ed-8ba6-130117898d4a.json
@@ -1,7 +1,6 @@
 {
     "attributes": {
         "description": "Overview of Fortinet FortiMail Email Events.",
-        "hits": 0,
         "kibanaSavedObjectMeta": {
             "searchSourceJSON": {
                 "filter": [
@@ -57,45 +56,65 @@
         "optionsJSON": {
             "hidePanelTitles": false,
             "syncColors": false,
+            "syncCursor": true,
+            "syncTooltips": false,
             "useMargins": true
         },
         "panelsJSON": [
             {
                 "embeddableConfig": {
-                    "enhancements": {},
-                    "hidePanelTitles": true,
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {
-                                "filter": [],
-                                "query": {
-                                    "language": "kuery",
-                                    "query": ""
-                                }
+                    "attributes": {
+                        "layout": "horizontal",
+                        "links": [
+                            {
+                                "destinationRefName": "link_e08da35b-272f-4077-a965-9d972c42d40b_dashboard",
+                                "id": "e08da35b-272f-4077-a965-9d972c42d40b",
+                                "label": "History",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 0,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_004bb2ca-a335-4fc2-9153-489d028cefa3_dashboard",
+                                "id": "004bb2ca-a335-4fc2-9153-489d028cefa3",
+                                "label": "System",
+                                "order": 1,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_d813de6e-b2f5-479e-a4a7-051950e09c85_dashboard",
+                                "id": "d813de6e-b2f5-479e-a4a7-051950e09c85",
+                                "label": "Antispam, Antivirus \u0026 Encryption",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 2,
+                                "type": "dashboardLink"
                             }
-                        },
-                        "description": "",
-                        "params": {
-                            "fontSize": 12,
-                            "markdown": "[History](#/dashboard/fortinet_fortimail-f352d950-a870-11ed-8ba6-130117898d4a) | [System](#/dashboard/fortinet_fortimail-d5803cc0-a937-11ed-8ba6-130117898d4a) | [Antispam, Antivirus \u0026 Encryption](#/dashboard/fortinet_fortimail-8adfeca0-a942-11ed-8ba6-130117898d4a)",
-                            "openLinksInNewTab": false
-                        },
-                        "title": "",
-                        "type": "markdown",
-                        "uiState": {}
-                    }
+                        ]
+                    },
+                    "disabledActions": [
+                        "OPEN_FLYOUT_ADD_DRILLDOWN"
+                    ],
+                    "enhancements": {},
+                    "hidePanelTitles": false
                 },
                 "gridData": {
-                    "h": 2,
-                    "i": "688f3007-85de-431a-8e7f-6b60a8ed7eb5",
+                    "h": 3,
+                    "i": "8f6b3e5d-a445-4a2b-8c33-209fbcae8a85",
                     "w": 48,
                     "x": 0,
                     "y": 0
                 },
-                "panelIndex": "688f3007-85de-431a-8e7f-6b60a8ed7eb5",
-                "type": "visualization",
-                "version": "8.3.0"
+                "panelIndex": "8f6b3e5d-a445-4a2b-8c33-209fbcae8a85",
+                "title": "Navigation",
+                "type": "links"
             },
             {
                 "embeddableConfig": {
@@ -109,7 +128,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "2dbecc3c-4666-42a9-954e-6f7a35497c5c": {
                                             "columnOrder": [
@@ -160,16 +179,18 @@
                                 "layers": [
                                     {
                                         "categoryDisplay": "default",
-                                        "groups": [
-                                            "cb7cd10e-de34-4a12-907b-b40624695744"
-                                        ],
                                         "layerId": "2dbecc3c-4666-42a9-954e-6f7a35497c5c",
                                         "layerType": "data",
                                         "legendDisplay": "default",
                                         "legendSize": "auto",
-                                        "metric": "4923289f-ab2f-4d0e-ba20-ca357b20a056",
+                                        "metrics": [
+                                            "4923289f-ab2f-4d0e-ba20-ca357b20a056"
+                                        ],
                                         "nestedLegend": false,
-                                        "numberDisplay": "percent"
+                                        "numberDisplay": "percent",
+                                        "primaryGroups": [
+                                            "cb7cd10e-de34-4a12-907b-b40624695744"
+                                        ]
                                     }
                                 ],
                                 "shape": "pie"
@@ -187,12 +208,11 @@
                     "i": "7663ea08-2eb2-4472-8d23-d3202dd7293f",
                     "w": 16,
                     "x": 0,
-                    "y": 2
+                    "y": 3
                 },
                 "panelIndex": "7663ea08-2eb2-4472-8d23-d3202dd7293f",
                 "title": "Distribution of Email Events by Priority [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -206,7 +226,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "84bbb463-353d-43f1-8461-82e7e4a592ca": {
                                             "columnOrder": [
@@ -277,17 +297,19 @@
                                 "layers": [
                                     {
                                         "categoryDisplay": "default",
-                                        "groups": [
-                                            "114ba38a-88ab-4424-b047-a8ec65e6af59",
-                                            "86faadb8-1251-4344-a4e1-acb41091d51e"
-                                        ],
                                         "layerId": "84bbb463-353d-43f1-8461-82e7e4a592ca",
                                         "layerType": "data",
                                         "legendDisplay": "default",
                                         "legendSize": "auto",
-                                        "metric": "8ae78e99-d14c-4165-babf-daaf0b7de6eb",
+                                        "metrics": [
+                                            "8ae78e99-d14c-4165-babf-daaf0b7de6eb"
+                                        ],
                                         "nestedLegend": false,
-                                        "numberDisplay": "percent"
+                                        "numberDisplay": "percent",
+                                        "primaryGroups": [
+                                            "114ba38a-88ab-4424-b047-a8ec65e6af59",
+                                            "86faadb8-1251-4344-a4e1-acb41091d51e"
+                                        ]
                                     }
                                 ],
                                 "shape": "pie"
@@ -305,12 +327,11 @@
                     "i": "b2ff19d5-0428-4306-9e19-cee7759b8613",
                     "w": 17,
                     "x": 16,
-                    "y": 2
+                    "y": 3
                 },
                 "panelIndex": "b2ff19d5-0428-4306-9e19-cee7759b8613",
                 "title": "Distribution of Email Events by Module and Submodule [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -324,7 +345,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "2b8c3bbc-ca7a-4740-94aa-20b0d4962497": {
                                             "columnOrder": [
@@ -375,16 +396,18 @@
                                 "layers": [
                                     {
                                         "categoryDisplay": "default",
-                                        "groups": [
-                                            "8ba25a71-94e9-42e6-bbfa-0112330f065e"
-                                        ],
                                         "layerId": "2b8c3bbc-ca7a-4740-94aa-20b0d4962497",
                                         "layerType": "data",
                                         "legendDisplay": "default",
                                         "legendSize": "auto",
-                                        "metric": "8a380391-6157-4fb3-b64d-cdbd7a48d878",
+                                        "metrics": [
+                                            "8a380391-6157-4fb3-b64d-cdbd7a48d878"
+                                        ],
                                         "nestedLegend": false,
-                                        "numberDisplay": "percent"
+                                        "numberDisplay": "percent",
+                                        "primaryGroups": [
+                                            "8ba25a71-94e9-42e6-bbfa-0112330f065e"
+                                        ]
                                     }
                                 ],
                                 "shape": "pie"
@@ -402,23 +425,21 @@
                     "i": "9bcb6c1a-b361-4e5c-9d28-67d95ba137bb",
                     "w": 15,
                     "x": 33,
-                    "y": 2
+                    "y": 3
                 },
                 "panelIndex": "9bcb6c1a-b361-4e5c-9d28-67d95ba137bb",
                 "title": "Distribution of Email Events by Subtype [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             }
         ],
         "timeRestore": false,
         "title": "[Logs Fortinet FortiMail] Email",
         "version": 1
     },
-    "coreMigrationVersion": "8.3.0",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:32:07.421Z",
     "id": "fortinet_fortimail-c4b7f4d0-a93e-11ed-8ba6-130117898d4a",
-    "migrationVersion": {
-        "dashboard": "8.3.0"
-    },
+    "managed": false,
     "references": [
         {
             "id": "logs-*",
@@ -430,6 +451,21 @@
             "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index",
             "type": "index-pattern"
         },
+        {
+            "id": "fortinet_fortimail-f352d950-a870-11ed-8ba6-130117898d4a",
+            "name": "8f6b3e5d-a445-4a2b-8c33-209fbcae8a85:link_e08da35b-272f-4077-a965-9d972c42d40b_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "fortinet_fortimail-d5803cc0-a937-11ed-8ba6-130117898d4a",
+            "name": "8f6b3e5d-a445-4a2b-8c33-209fbcae8a85:link_004bb2ca-a335-4fc2-9153-489d028cefa3_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "fortinet_fortimail-8adfeca0-a942-11ed-8ba6-130117898d4a",
+            "name": "8f6b3e5d-a445-4a2b-8c33-209fbcae8a85:link_d813de6e-b2f5-479e-a4a7-051950e09c85_dashboard",
+            "type": "dashboard"
+        },
         {
             "id": "logs-*",
             "name": "7663ea08-2eb2-4472-8d23-d3202dd7293f:indexpattern-datasource-layer-2dbecc3c-4666-42a9-954e-6f7a35497c5c",
@@ -444,7 +480,13 @@
             "id": "logs-*",
             "name": "9bcb6c1a-b361-4e5c-9d28-67d95ba137bb:indexpattern-datasource-layer-2b8c3bbc-ca7a-4740-94aa-20b0d4962497",
             "type": "index-pattern"
+        },
+        {
+            "id": "fortinet_fortimail-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "dashboard"
+    "type": "dashboard",
+    "typeMigrationVersion": "8.9.0"
 }
\ No newline at end of file
diff --git a/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-d5803cc0-a937-11ed-8ba6-130117898d4a.json b/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-d5803cc0-a937-11ed-8ba6-130117898d4a.json
index d0a3756c579..82a2d771b4d 100644
--- a/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-d5803cc0-a937-11ed-8ba6-130117898d4a.json
+++ b/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-d5803cc0-a937-11ed-8ba6-130117898d4a.json
@@ -1,7 +1,6 @@
 {
     "attributes": {
         "description": "Overview of Fortinet FortiMail System Events.",
-        "hits": 0,
         "kibanaSavedObjectMeta": {
             "searchSourceJSON": {
                 "filter": [
@@ -57,45 +56,70 @@
         "optionsJSON": {
             "hidePanelTitles": false,
             "syncColors": false,
+            "syncCursor": true,
+            "syncTooltips": false,
             "useMargins": true
         },
         "panelsJSON": [
             {
                 "embeddableConfig": {
-                    "enhancements": {},
-                    "hidePanelTitles": true,
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {
-                                "filter": [],
-                                "query": {
-                                    "language": "kuery",
-                                    "query": ""
-                                }
+                    "attributes": {
+                        "layout": "horizontal",
+                        "links": [
+                            {
+                                "destinationRefName": "link_fdd9fc24-3589-409a-b6f3-402eaa89701f_dashboard",
+                                "id": "fdd9fc24-3589-409a-b6f3-402eaa89701f",
+                                "label": "History",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 0,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_6d809cb6-00e4-450d-8977-7c2f97a7550c_dashboard",
+                                "id": "6d809cb6-00e4-450d-8977-7c2f97a7550c",
+                                "label": "Email",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 1,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_d0891e12-7947-4a8b-8343-c16c86f0614d_dashboard",
+                                "id": "d0891e12-7947-4a8b-8343-c16c86f0614d",
+                                "label": "Antispam, Antivirus \u0026 Encryption",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 2,
+                                "type": "dashboardLink"
                             }
-                        },
-                        "description": "",
-                        "params": {
-                            "fontSize": 12,
-                            "markdown": "[History](#/dashboard/fortinet_fortimail-f352d950-a870-11ed-8ba6-130117898d4a) | [Email](#/dashboard/fortinet_fortimail-c4b7f4d0-a93e-11ed-8ba6-130117898d4a) | [Antispam, Antivirus \u0026 Encryption](#/dashboard/fortinet_fortimail-8adfeca0-a942-11ed-8ba6-130117898d4a)",
-                            "openLinksInNewTab": false
-                        },
-                        "title": "",
-                        "type": "markdown",
-                        "uiState": {}
-                    }
+                        ]
+                    },
+                    "disabledActions": [
+                        "OPEN_FLYOUT_ADD_DRILLDOWN"
+                    ],
+                    "enhancements": {},
+                    "hidePanelTitles": false
                 },
                 "gridData": {
-                    "h": 2,
-                    "i": "1e74ea81-51b9-4638-a97d-c045c076a477",
+                    "h": 3,
+                    "i": "be38fc4d-7f49-4988-bf38-cd2d6cc72f66",
                     "w": 48,
                     "x": 0,
                     "y": 0
                 },
-                "panelIndex": "1e74ea81-51b9-4638-a97d-c045c076a477",
-                "type": "visualization",
-                "version": "8.3.0"
+                "panelIndex": "be38fc4d-7f49-4988-bf38-cd2d6cc72f66",
+                "title": "Navigation",
+                "type": "links"
             },
             {
                 "embeddableConfig": {
@@ -109,7 +133,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "28950c13-b1bf-4cf7-90fa-ce0f3f885146": {
                                             "columnOrder": [
@@ -185,12 +209,11 @@
                     "i": "9a805d6b-39cf-4e6f-ab0e-0d641bbad9e4",
                     "w": 24,
                     "x": 0,
-                    "y": 2
+                    "y": 3
                 },
                 "panelIndex": "9a805d6b-39cf-4e6f-ab0e-0d641bbad9e4",
                 "title": "Top 10 Active User [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -204,7 +227,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "fc005e12-9a35-4685-bdda-ee452f0d783a": {
                                             "columnOrder": [
@@ -255,16 +278,18 @@
                                 "layers": [
                                     {
                                         "categoryDisplay": "default",
-                                        "groups": [
-                                            "d467d9a8-05d7-42e2-89e4-818eb033cb92"
-                                        ],
                                         "layerId": "fc005e12-9a35-4685-bdda-ee452f0d783a",
                                         "layerType": "data",
                                         "legendDisplay": "default",
                                         "legendSize": "auto",
-                                        "metric": "d5b57f37-64d9-4aff-be64-0c68cd2a9614",
+                                        "metrics": [
+                                            "d5b57f37-64d9-4aff-be64-0c68cd2a9614"
+                                        ],
                                         "nestedLegend": false,
-                                        "numberDisplay": "percent"
+                                        "numberDisplay": "percent",
+                                        "primaryGroups": [
+                                            "d467d9a8-05d7-42e2-89e4-818eb033cb92"
+                                        ]
                                     }
                                 ],
                                 "shape": "pie"
@@ -282,12 +307,11 @@
                     "i": "8616c5c3-a4b2-407e-b7ee-039b83ae42fe",
                     "w": 24,
                     "x": 24,
-                    "y": 2
+                    "y": 3
                 },
                 "panelIndex": "8616c5c3-a4b2-407e-b7ee-039b83ae42fe",
                 "title": "Distribution of System Events by Subtype [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -301,7 +325,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "c2a745c1-3869-47ca-99df-28634554fe75": {
                                             "columnOrder": [
@@ -352,16 +376,18 @@
                                 "layers": [
                                     {
                                         "categoryDisplay": "default",
-                                        "groups": [
-                                            "22a4729c-e76a-4189-aeb3-ea6d97337769"
-                                        ],
                                         "layerId": "c2a745c1-3869-47ca-99df-28634554fe75",
                                         "layerType": "data",
                                         "legendDisplay": "default",
                                         "legendSize": "auto",
-                                        "metric": "2e517f97-3610-42a0-9840-e947c0fe446b",
+                                        "metrics": [
+                                            "2e517f97-3610-42a0-9840-e947c0fe446b"
+                                        ],
                                         "nestedLegend": false,
-                                        "numberDisplay": "percent"
+                                        "numberDisplay": "percent",
+                                        "primaryGroups": [
+                                            "22a4729c-e76a-4189-aeb3-ea6d97337769"
+                                        ]
                                     }
                                 ],
                                 "shape": "pie"
@@ -379,12 +405,11 @@
                     "i": "e53fc94d-95ea-4e7f-a8e4-ca149de28060",
                     "w": 24,
                     "x": 0,
-                    "y": 17
+                    "y": 18
                 },
                 "panelIndex": "e53fc94d-95ea-4e7f-a8e4-ca149de28060",
                 "title": "Distribution of System Events by Priority [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -392,30 +417,31 @@
                         "references": [
                             {
                                 "id": "logs-*",
-                                "name": "indexpattern-datasource-layer-bbb46e07-29f2-4228-b128-f7f232f07bb9",
+                                "name": "indexpattern-datasource-layer-f886482d-4c54-4bdb-8ebe-a9ff9882e2da",
                                 "type": "index-pattern"
                             }
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
-                                        "bbb46e07-29f2-4228-b128-f7f232f07bb9": {
+                                        "f886482d-4c54-4bdb-8ebe-a9ff9882e2da": {
                                             "columnOrder": [
-                                                "0a48a3da-a582-4de0-9d26-49a0fd5dd6e2",
-                                                "ff5af4dd-41de-4ca4-a182-2df99308c0e7"
+                                                "37dfc6d1-539b-4fef-b1ed-003ab4b49bf4",
+                                                "c08d4ff2-173d-4a8f-b2d0-b2e5f5e239f0",
+                                                "8e8e10c0-a3f2-44ae-8e40-24cb33e15ee1"
                                             ],
                                             "columns": {
-                                                "0a48a3da-a582-4de0-9d26-49a0fd5dd6e2": {
+                                                "37dfc6d1-539b-4fef-b1ed-003ab4b49bf4": {
                                                     "customLabel": true,
                                                     "dataType": "string",
                                                     "isBucketed": true,
-                                                    "label": "Status",
+                                                    "label": "Module",
                                                     "operationType": "terms",
                                                     "params": {
                                                         "missingBucket": false,
                                                         "orderBy": {
-                                                            "columnId": "ff5af4dd-41de-4ca4-a182-2df99308c0e7",
+                                                            "columnId": "8e8e10c0-a3f2-44ae-8e40-24cb33e15ee1",
                                                             "type": "column"
                                                         },
                                                         "orderDirection": "desc",
@@ -423,9 +449,9 @@
                                                         "size": 5
                                                     },
                                                     "scale": "ordinal",
-                                                    "sourceField": "fortinet_fortimail.log.status"
+                                                    "sourceField": "fortinet_fortimail.log.module"
                                                 },
-                                                "ff5af4dd-41de-4ca4-a182-2df99308c0e7": {
+                                                "8e8e10c0-a3f2-44ae-8e40-24cb33e15ee1": {
                                                     "customLabel": true,
                                                     "dataType": "number",
                                                     "isBucketed": false,
@@ -433,6 +459,25 @@
                                                     "operationType": "count",
                                                     "scale": "ratio",
                                                     "sourceField": "___records___"
+                                                },
+                                                "c08d4ff2-173d-4a8f-b2d0-b2e5f5e239f0": {
+                                                    "customLabel": true,
+                                                    "dataType": "string",
+                                                    "isBucketed": true,
+                                                    "label": "Submodule",
+                                                    "operationType": "terms",
+                                                    "params": {
+                                                        "missingBucket": false,
+                                                        "orderBy": {
+                                                            "columnId": "8e8e10c0-a3f2-44ae-8e40-24cb33e15ee1",
+                                                            "type": "column"
+                                                        },
+                                                        "orderDirection": "desc",
+                                                        "otherBucket": true,
+                                                        "size": 5
+                                                    },
+                                                    "scale": "ordinal",
+                                                    "sourceField": "fortinet_fortimail.log.sub_module"
                                                 }
                                             },
                                             "incompleteColumns": {}
@@ -449,16 +494,19 @@
                                 "layers": [
                                     {
                                         "categoryDisplay": "default",
-                                        "groups": [
-                                            "0a48a3da-a582-4de0-9d26-49a0fd5dd6e2"
-                                        ],
-                                        "layerId": "bbb46e07-29f2-4228-b128-f7f232f07bb9",
+                                        "layerId": "f886482d-4c54-4bdb-8ebe-a9ff9882e2da",
                                         "layerType": "data",
                                         "legendDisplay": "default",
                                         "legendSize": "auto",
-                                        "metric": "ff5af4dd-41de-4ca4-a182-2df99308c0e7",
+                                        "metrics": [
+                                            "8e8e10c0-a3f2-44ae-8e40-24cb33e15ee1"
+                                        ],
                                         "nestedLegend": false,
-                                        "numberDisplay": "percent"
+                                        "numberDisplay": "percent",
+                                        "primaryGroups": [
+                                            "37dfc6d1-539b-4fef-b1ed-003ab4b49bf4",
+                                            "c08d4ff2-173d-4a8f-b2d0-b2e5f5e239f0"
+                                        ]
                                     }
                                 ],
                                 "shape": "pie"
@@ -473,15 +521,14 @@
                 },
                 "gridData": {
                     "h": 15,
-                    "i": "610b3615-7f69-4a91-a516-5733e207faf9",
+                    "i": "af733eff-d4c4-450f-8714-21af4a470ba1",
                     "w": 24,
                     "x": 24,
-                    "y": 32
+                    "y": 18
                 },
-                "panelIndex": "610b3615-7f69-4a91-a516-5733e207faf9",
-                "title": "Distribution of System Events by Status [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "panelIndex": "af733eff-d4c4-450f-8714-21af4a470ba1",
+                "title": "Distribution of System Events by Module and Submodule [Logs Fortinet FortiMail]",
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -495,7 +542,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "6d8e5dff-53b9-435c-91f4-4c58b78fa920": {
                                             "columnOrder": [
@@ -546,16 +593,18 @@
                                 "layers": [
                                     {
                                         "categoryDisplay": "default",
-                                        "groups": [
-                                            "c4ad5415-73cc-4721-8e5b-8d237028d24e"
-                                        ],
                                         "layerId": "6d8e5dff-53b9-435c-91f4-4c58b78fa920",
                                         "layerType": "data",
                                         "legendDisplay": "default",
                                         "legendSize": "auto",
-                                        "metric": "45ae60ed-060d-41d7-84e8-5f12f716a60c",
+                                        "metrics": [
+                                            "45ae60ed-060d-41d7-84e8-5f12f716a60c"
+                                        ],
                                         "nestedLegend": false,
-                                        "numberDisplay": "percent"
+                                        "numberDisplay": "percent",
+                                        "primaryGroups": [
+                                            "c4ad5415-73cc-4721-8e5b-8d237028d24e"
+                                        ]
                                     }
                                 ],
                                 "shape": "pie"
@@ -573,12 +622,11 @@
                     "i": "88cbf130-1b25-49fc-9863-db42827529c5",
                     "w": 24,
                     "x": 0,
-                    "y": 32
+                    "y": 33
                 },
                 "panelIndex": "88cbf130-1b25-49fc-9863-db42827529c5",
                 "title": "Distribution of System Events by Action [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -586,31 +634,30 @@
                         "references": [
                             {
                                 "id": "logs-*",
-                                "name": "indexpattern-datasource-layer-f886482d-4c54-4bdb-8ebe-a9ff9882e2da",
+                                "name": "indexpattern-datasource-layer-bbb46e07-29f2-4228-b128-f7f232f07bb9",
                                 "type": "index-pattern"
                             }
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
-                                        "f886482d-4c54-4bdb-8ebe-a9ff9882e2da": {
+                                        "bbb46e07-29f2-4228-b128-f7f232f07bb9": {
                                             "columnOrder": [
-                                                "37dfc6d1-539b-4fef-b1ed-003ab4b49bf4",
-                                                "c08d4ff2-173d-4a8f-b2d0-b2e5f5e239f0",
-                                                "8e8e10c0-a3f2-44ae-8e40-24cb33e15ee1"
+                                                "0a48a3da-a582-4de0-9d26-49a0fd5dd6e2",
+                                                "ff5af4dd-41de-4ca4-a182-2df99308c0e7"
                                             ],
                                             "columns": {
-                                                "37dfc6d1-539b-4fef-b1ed-003ab4b49bf4": {
+                                                "0a48a3da-a582-4de0-9d26-49a0fd5dd6e2": {
                                                     "customLabel": true,
                                                     "dataType": "string",
                                                     "isBucketed": true,
-                                                    "label": "Module",
+                                                    "label": "Status",
                                                     "operationType": "terms",
                                                     "params": {
                                                         "missingBucket": false,
                                                         "orderBy": {
-                                                            "columnId": "8e8e10c0-a3f2-44ae-8e40-24cb33e15ee1",
+                                                            "columnId": "ff5af4dd-41de-4ca4-a182-2df99308c0e7",
                                                             "type": "column"
                                                         },
                                                         "orderDirection": "desc",
@@ -618,9 +665,9 @@
                                                         "size": 5
                                                     },
                                                     "scale": "ordinal",
-                                                    "sourceField": "fortinet_fortimail.log.module"
+                                                    "sourceField": "fortinet_fortimail.log.status"
                                                 },
-                                                "8e8e10c0-a3f2-44ae-8e40-24cb33e15ee1": {
+                                                "ff5af4dd-41de-4ca4-a182-2df99308c0e7": {
                                                     "customLabel": true,
                                                     "dataType": "number",
                                                     "isBucketed": false,
@@ -628,25 +675,6 @@
                                                     "operationType": "count",
                                                     "scale": "ratio",
                                                     "sourceField": "___records___"
-                                                },
-                                                "c08d4ff2-173d-4a8f-b2d0-b2e5f5e239f0": {
-                                                    "customLabel": true,
-                                                    "dataType": "string",
-                                                    "isBucketed": true,
-                                                    "label": "Submodule",
-                                                    "operationType": "terms",
-                                                    "params": {
-                                                        "missingBucket": false,
-                                                        "orderBy": {
-                                                            "columnId": "8e8e10c0-a3f2-44ae-8e40-24cb33e15ee1",
-                                                            "type": "column"
-                                                        },
-                                                        "orderDirection": "desc",
-                                                        "otherBucket": true,
-                                                        "size": 5
-                                                    },
-                                                    "scale": "ordinal",
-                                                    "sourceField": "fortinet_fortimail.log.sub_module"
                                                 }
                                             },
                                             "incompleteColumns": {}
@@ -663,17 +691,18 @@
                                 "layers": [
                                     {
                                         "categoryDisplay": "default",
-                                        "groups": [
-                                            "37dfc6d1-539b-4fef-b1ed-003ab4b49bf4",
-                                            "c08d4ff2-173d-4a8f-b2d0-b2e5f5e239f0"
-                                        ],
-                                        "layerId": "f886482d-4c54-4bdb-8ebe-a9ff9882e2da",
+                                        "layerId": "bbb46e07-29f2-4228-b128-f7f232f07bb9",
                                         "layerType": "data",
                                         "legendDisplay": "default",
                                         "legendSize": "auto",
-                                        "metric": "8e8e10c0-a3f2-44ae-8e40-24cb33e15ee1",
+                                        "metrics": [
+                                            "ff5af4dd-41de-4ca4-a182-2df99308c0e7"
+                                        ],
                                         "nestedLegend": false,
-                                        "numberDisplay": "percent"
+                                        "numberDisplay": "percent",
+                                        "primaryGroups": [
+                                            "0a48a3da-a582-4de0-9d26-49a0fd5dd6e2"
+                                        ]
                                     }
                                 ],
                                 "shape": "pie"
@@ -688,26 +717,24 @@
                 },
                 "gridData": {
                     "h": 15,
-                    "i": "af733eff-d4c4-450f-8714-21af4a470ba1",
+                    "i": "610b3615-7f69-4a91-a516-5733e207faf9",
                     "w": 24,
                     "x": 24,
-                    "y": 17
+                    "y": 33
                 },
-                "panelIndex": "af733eff-d4c4-450f-8714-21af4a470ba1",
-                "title": "Distribution of System Events by Module and Submodule [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "panelIndex": "610b3615-7f69-4a91-a516-5733e207faf9",
+                "title": "Distribution of System Events by Status [Logs Fortinet FortiMail]",
+                "type": "lens"
             }
         ],
         "timeRestore": false,
         "title": "[Logs Fortinet FortiMail] System",
         "version": 1
     },
-    "coreMigrationVersion": "8.3.0",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:33:38.572Z",
     "id": "fortinet_fortimail-d5803cc0-a937-11ed-8ba6-130117898d4a",
-    "migrationVersion": {
-        "dashboard": "8.3.0"
-    },
+    "managed": false,
     "references": [
         {
             "id": "logs-*",
@@ -719,6 +746,21 @@
             "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index",
             "type": "index-pattern"
         },
+        {
+            "id": "fortinet_fortimail-f352d950-a870-11ed-8ba6-130117898d4a",
+            "name": "be38fc4d-7f49-4988-bf38-cd2d6cc72f66:link_fdd9fc24-3589-409a-b6f3-402eaa89701f_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "fortinet_fortimail-c4b7f4d0-a93e-11ed-8ba6-130117898d4a",
+            "name": "be38fc4d-7f49-4988-bf38-cd2d6cc72f66:link_6d809cb6-00e4-450d-8977-7c2f97a7550c_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "fortinet_fortimail-8adfeca0-a942-11ed-8ba6-130117898d4a",
+            "name": "be38fc4d-7f49-4988-bf38-cd2d6cc72f66:link_d0891e12-7947-4a8b-8343-c16c86f0614d_dashboard",
+            "type": "dashboard"
+        },
         {
             "id": "logs-*",
             "name": "9a805d6b-39cf-4e6f-ab0e-0d641bbad9e4:indexpattern-datasource-layer-28950c13-b1bf-4cf7-90fa-ce0f3f885146",
@@ -736,7 +778,7 @@
         },
         {
             "id": "logs-*",
-            "name": "610b3615-7f69-4a91-a516-5733e207faf9:indexpattern-datasource-layer-bbb46e07-29f2-4228-b128-f7f232f07bb9",
+            "name": "af733eff-d4c4-450f-8714-21af4a470ba1:indexpattern-datasource-layer-f886482d-4c54-4bdb-8ebe-a9ff9882e2da",
             "type": "index-pattern"
         },
         {
@@ -746,9 +788,15 @@
         },
         {
             "id": "logs-*",
-            "name": "af733eff-d4c4-450f-8714-21af4a470ba1:indexpattern-datasource-layer-f886482d-4c54-4bdb-8ebe-a9ff9882e2da",
+            "name": "610b3615-7f69-4a91-a516-5733e207faf9:indexpattern-datasource-layer-bbb46e07-29f2-4228-b128-f7f232f07bb9",
             "type": "index-pattern"
+        },
+        {
+            "id": "fortinet_fortimail-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "dashboard"
+    "type": "dashboard",
+    "typeMigrationVersion": "8.9.0"
 }
\ No newline at end of file
diff --git a/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-f352d950-a870-11ed-8ba6-130117898d4a.json b/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-f352d950-a870-11ed-8ba6-130117898d4a.json
index 5bfd06b1a8f..99cadfd3ed5 100644
--- a/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-f352d950-a870-11ed-8ba6-130117898d4a.json
+++ b/packages/fortinet_fortimail/kibana/dashboard/fortinet_fortimail-f352d950-a870-11ed-8ba6-130117898d4a.json
@@ -1,7 +1,6 @@
 {
     "attributes": {
         "description": "Overview of Fortinet FortiMail History Events.",
-        "hits": 0,
         "kibanaSavedObjectMeta": {
             "searchSourceJSON": {
                 "filter": [
@@ -57,45 +56,70 @@
         "optionsJSON": {
             "hidePanelTitles": false,
             "syncColors": false,
+            "syncCursor": true,
+            "syncTooltips": false,
             "useMargins": true
         },
         "panelsJSON": [
             {
                 "embeddableConfig": {
-                    "enhancements": {},
-                    "hidePanelTitles": true,
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {
-                                "filter": [],
-                                "query": {
-                                    "language": "kuery",
-                                    "query": ""
-                                }
+                    "attributes": {
+                        "layout": "horizontal",
+                        "links": [
+                            {
+                                "destinationRefName": "link_1b18a64e-03f0-4aa5-840f-4029c2bb707f_dashboard",
+                                "id": "1b18a64e-03f0-4aa5-840f-4029c2bb707f",
+                                "label": "System",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 0,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_e9a6b455-9fbe-4b66-b1e1-13374d098f60_dashboard",
+                                "id": "e9a6b455-9fbe-4b66-b1e1-13374d098f60",
+                                "label": "Email",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 1,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_808eebff-c2c8-4f9f-90b6-54ec07045d20_dashboard",
+                                "id": "808eebff-c2c8-4f9f-90b6-54ec07045d20",
+                                "label": "Antispam, Antivirus \u0026 Encryption",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 2,
+                                "type": "dashboardLink"
                             }
-                        },
-                        "description": "",
-                        "params": {
-                            "fontSize": 12,
-                            "markdown": "[System](#/dashboard/fortinet_fortimail-d5803cc0-a937-11ed-8ba6-130117898d4a) | [Email](#/dashboard/fortinet_fortimail-c4b7f4d0-a93e-11ed-8ba6-130117898d4a) | [Antispam, Antivirus \u0026 Encryption](#/dashboard/fortinet_fortimail-8adfeca0-a942-11ed-8ba6-130117898d4a)",
-                            "openLinksInNewTab": false
-                        },
-                        "title": "",
-                        "type": "markdown",
-                        "uiState": {}
-                    }
+                        ]
+                    },
+                    "disabledActions": [
+                        "OPEN_FLYOUT_ADD_DRILLDOWN"
+                    ],
+                    "enhancements": {},
+                    "hidePanelTitles": false
                 },
                 "gridData": {
-                    "h": 2,
-                    "i": "ef0db8aa-c75d-4162-a9d5-350b907fc2d0",
+                    "h": 3,
+                    "i": "a947ff29-dbcd-417e-b246-eeec03f5f34e",
                     "w": 48,
                     "x": 0,
                     "y": 0
                 },
-                "panelIndex": "ef0db8aa-c75d-4162-a9d5-350b907fc2d0",
-                "type": "visualization",
-                "version": "8.3.0"
+                "panelIndex": "a947ff29-dbcd-417e-b246-eeec03f5f34e",
+                "title": "Navigation",
+                "type": "links"
             },
             {
                 "embeddableConfig": {
@@ -109,7 +133,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "e4009c79-05d5-4745-8017-d97f6546e54f": {
                                             "columnOrder": [
@@ -147,7 +171,7 @@
                         },
                         "title": "",
                         "type": "lens",
-                        "visualizationType": "lnsMetric"
+                        "visualizationType": "lnsLegacyMetric"
                     },
                     "enhancements": {},
                     "hidePanelTitles": false
@@ -157,12 +181,11 @@
                     "i": "45ef6684-a091-429b-b178-be16f1dc6e20",
                     "w": 24,
                     "x": 0,
-                    "y": 2
+                    "y": 3
                 },
                 "panelIndex": "45ef6684-a091-429b-b178-be16f1dc6e20",
                 "title": "Unique Count of History Events by Direction [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -176,7 +199,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "d7b0986e-bac9-4cc2-ba63-0730913c573e": {
                                             "columnOrder": [
@@ -253,12 +276,11 @@
                     "i": "634448c8-5087-40af-9bc8-c71e81de5386",
                     "w": 24,
                     "x": 24,
-                    "y": 2
+                    "y": 3
                 },
                 "panelIndex": "634448c8-5087-40af-9bc8-c71e81de5386",
                 "title": "Top 10 Sender Email [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -272,7 +294,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "621cf416-f772-42ee-9f2e-6be699c1fde6": {
                                             "columnOrder": [
@@ -348,12 +370,11 @@
                     "i": "de8a2de9-dfb2-4e2a-b62f-eed63bea9e26",
                     "w": 24,
                     "x": 0,
-                    "y": 17
+                    "y": 18
                 },
                 "panelIndex": "de8a2de9-dfb2-4e2a-b62f-eed63bea9e26",
                 "title": "Top 10 Receiver Email [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -367,7 +388,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "8f4bed3a-6cdb-4ef9-8e6c-4f06c3ad14c5": {
                                             "columnOrder": [
@@ -456,12 +477,11 @@
                     "i": "6da03b5f-d2de-468c-9f13-2170f58cc66e",
                     "w": 24,
                     "x": 24,
-                    "y": 17
+                    "y": 18
                 },
                 "panelIndex": "6da03b5f-d2de-468c-9f13-2170f58cc66e",
                 "title": "Distribution of History Events by Mailer [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -475,7 +495,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "4e88c4b8-7444-4366-9b47-88bb66ea50fd": {
                                             "columnOrder": [
@@ -526,16 +546,18 @@
                                 "layers": [
                                     {
                                         "categoryDisplay": "default",
-                                        "groups": [
-                                            "c885c2d0-a5cf-4780-8bb6-b0333c190521"
-                                        ],
                                         "layerId": "4e88c4b8-7444-4366-9b47-88bb66ea50fd",
                                         "layerType": "data",
                                         "legendDisplay": "default",
                                         "legendSize": "auto",
-                                        "metric": "119c5065-0df3-459c-9aed-a429a69a70c5",
+                                        "metrics": [
+                                            "119c5065-0df3-459c-9aed-a429a69a70c5"
+                                        ],
                                         "nestedLegend": false,
-                                        "numberDisplay": "percent"
+                                        "numberDisplay": "percent",
+                                        "primaryGroups": [
+                                            "c885c2d0-a5cf-4780-8bb6-b0333c190521"
+                                        ]
                                     }
                                 ],
                                 "shape": "pie"
@@ -553,12 +575,11 @@
                     "i": "fd3ae236-6543-4c0c-9fb1-58a83c5fd466",
                     "w": 24,
                     "x": 0,
-                    "y": 32
+                    "y": 33
                 },
                 "panelIndex": "fd3ae236-6543-4c0c-9fb1-58a83c5fd466",
                 "title": "Distribution of History Events by Priority [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -572,7 +593,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "27a7fb0a-c3a0-429b-b4cd-f39fdf020b4c": {
                                             "columnOrder": [
@@ -661,12 +682,11 @@
                     "i": "696eef95-200d-4de9-90fc-acbbbadcfe3e",
                     "w": 24,
                     "x": 24,
-                    "y": 32
+                    "y": 33
                 },
                 "panelIndex": "696eef95-200d-4de9-90fc-acbbbadcfe3e",
                 "title": "Distribution of History Events by Endpoint [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -680,7 +700,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "51e4ca67-0698-4fda-b192-02c680c0d5b3": {
                                             "columnOrder": [
@@ -769,12 +789,11 @@
                     "i": "b8d414dc-d8a9-47df-a086-ccc1eebc4356",
                     "w": 24,
                     "x": 0,
-                    "y": 47
+                    "y": 48
                 },
                 "panelIndex": "b8d414dc-d8a9-47df-a086-ccc1eebc4356",
                 "title": "Distribution of History Events by Domain [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -788,7 +807,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "324793f8-44ec-4f22-9105-cd9af473cd7f": {
                                             "columnOrder": [
@@ -839,16 +858,18 @@
                                 "layers": [
                                     {
                                         "categoryDisplay": "default",
-                                        "groups": [
-                                            "5cbfb09c-51ac-4091-beed-63b955801a35"
-                                        ],
                                         "layerId": "324793f8-44ec-4f22-9105-cd9af473cd7f",
                                         "layerType": "data",
                                         "legendDisplay": "default",
                                         "legendSize": "auto",
-                                        "metric": "2a0e1ec9-99c0-4120-abb3-f4cee62ac529",
+                                        "metrics": [
+                                            "2a0e1ec9-99c0-4120-abb3-f4cee62ac529"
+                                        ],
                                         "nestedLegend": false,
-                                        "numberDisplay": "percent"
+                                        "numberDisplay": "percent",
+                                        "primaryGroups": [
+                                            "5cbfb09c-51ac-4091-beed-63b955801a35"
+                                        ]
                                     }
                                 ],
                                 "shape": "pie"
@@ -866,12 +887,11 @@
                     "i": "081329b9-41c6-47a5-b835-4bc72ff4f40f",
                     "w": 24,
                     "x": 24,
-                    "y": 47
+                    "y": 48
                 },
                 "panelIndex": "081329b9-41c6-47a5-b835-4bc72ff4f40f",
                 "title": "Distribution of History Events by Resolution of DNS Lookup [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -885,7 +905,7 @@
                         ],
                         "state": {
                             "datasourceStates": {
-                                "indexpattern": {
+                                "formBased": {
                                     "layers": {
                                         "77794e8c-ec24-424d-9ba1-5c2c158288b7": {
                                             "columnOrder": [
@@ -995,23 +1015,21 @@
                     "i": "ba6894a8-b4d9-4980-be71-0a93823fccce",
                     "w": 48,
                     "x": 0,
-                    "y": 62
+                    "y": 63
                 },
                 "panelIndex": "ba6894a8-b4d9-4980-be71-0a93823fccce",
                 "title": "Email Direction over Time [Logs Fortinet FortiMail]",
-                "type": "lens",
-                "version": "8.3.0"
+                "type": "lens"
             }
         ],
         "timeRestore": false,
         "title": "[Logs Fortinet FortiMail] History",
         "version": 1
     },
-    "coreMigrationVersion": "8.3.0",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:30:20.529Z",
     "id": "fortinet_fortimail-f352d950-a870-11ed-8ba6-130117898d4a",
-    "migrationVersion": {
-        "dashboard": "8.3.0"
-    },
+    "managed": false,
     "references": [
         {
             "id": "metrics-*",
@@ -1023,6 +1041,21 @@
             "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index",
             "type": "index-pattern"
         },
+        {
+            "id": "fortinet_fortimail-d5803cc0-a937-11ed-8ba6-130117898d4a",
+            "name": "a947ff29-dbcd-417e-b246-eeec03f5f34e:link_1b18a64e-03f0-4aa5-840f-4029c2bb707f_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "fortinet_fortimail-c4b7f4d0-a93e-11ed-8ba6-130117898d4a",
+            "name": "a947ff29-dbcd-417e-b246-eeec03f5f34e:link_e9a6b455-9fbe-4b66-b1e1-13374d098f60_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "fortinet_fortimail-8adfeca0-a942-11ed-8ba6-130117898d4a",
+            "name": "a947ff29-dbcd-417e-b246-eeec03f5f34e:link_808eebff-c2c8-4f9f-90b6-54ec07045d20_dashboard",
+            "type": "dashboard"
+        },
         {
             "id": "logs-*",
             "name": "45ef6684-a091-429b-b178-be16f1dc6e20:indexpattern-datasource-layer-e4009c79-05d5-4745-8017-d97f6546e54f",
@@ -1067,7 +1100,13 @@
             "id": "logs-*",
             "name": "ba6894a8-b4d9-4980-be71-0a93823fccce:indexpattern-datasource-layer-77794e8c-ec24-424d-9ba1-5c2c158288b7",
             "type": "index-pattern"
+        },
+        {
+            "id": "fortinet_fortimail-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "dashboard"
+    "type": "dashboard",
+    "typeMigrationVersion": "8.9.0"
 }
\ No newline at end of file
diff --git a/packages/fortinet_fortimail/kibana/tag/fortinet_fortimail-security-solution-default.json b/packages/fortinet_fortimail/kibana/tag/fortinet_fortimail-security-solution-default.json
new file mode 100644
index 00000000000..ab7b43ce014
--- /dev/null
+++ b/packages/fortinet_fortimail/kibana/tag/fortinet_fortimail-security-solution-default.json
@@ -0,0 +1,14 @@
+{
+    "attributes": {
+        "color": "#FEC514",
+        "description": "Tag defined in package-spec",
+        "name": "Security Solution"
+    },
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T18:22:12.701Z",
+    "id": "fortinet_fortimail-security-solution-default",
+    "managed": false,
+    "references": [],
+    "type": "tag",
+    "typeMigrationVersion": "8.0.0"
+}
\ No newline at end of file
diff --git a/packages/fortinet_fortimail/manifest.yml b/packages/fortinet_fortimail/manifest.yml
index 5f2b884c068..87c80637b80 100644
--- a/packages/fortinet_fortimail/manifest.yml
+++ b/packages/fortinet_fortimail/manifest.yml
@@ -1,13 +1,13 @@
 name: fortinet_fortimail
 title: Fortinet FortiMail
-version: "2.15.1"
+version: "2.16.0"
 description: Collect logs from Fortinet FortiMail instances with Elastic Agent.
 type: integration
 format_version: "3.0.3"
 categories: ["security", "email_security"]
 conditions:
   kibana:
-    version: "^8.3.0 || ^9.0.0"
+    version: "^8.11.0 || ^9.0.0"
   elastic:
     subscription: basic
 icons:
diff --git a/packages/imperva/changelog.yml b/packages/imperva/changelog.yml
index 8aa4b0240e2..2c56ce259ba 100644
--- a/packages/imperva/changelog.yml
+++ b/packages/imperva/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.8.0"
+  changes:
+    - description: Removed markdown links from dashboards.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/14938
 - version: "1.7.1"
   changes:
     - description: Changed owners.
diff --git a/packages/imperva/kibana/dashboard/imperva-7579f360-69a9-11ee-a2d3-91cb43f7ca23.json b/packages/imperva/kibana/dashboard/imperva-7579f360-69a9-11ee-a2d3-91cb43f7ca23.json
index 735f1ca3bb3..a0c0d33a509 100644
--- a/packages/imperva/kibana/dashboard/imperva-7579f360-69a9-11ee-a2d3-91cb43f7ca23.json
+++ b/packages/imperva/kibana/dashboard/imperva-7579f360-69a9-11ee-a2d3-91cb43f7ca23.json
@@ -37,7 +37,7 @@
                         "id": "",
                         "params": {
                             "fontSize": 12,
-                            "markdown": "Navigation\n\n[SecureSphere (This Page)](#/dashboard/imperva-7579f360-69a9-11ee-a2d3-91cb43f7ca23)\n\n[Integration Page](/app/integrations/detail/imperva-0.19.0/)\n\nOverview\n\nThis dashboard shows the Imperva device logs related to this Integration.\n\nThis dashboard is made to provide general statistics and show the detection of the Imperva Securesphere logs.\n\nIt provides information on the Source IP with the Highest Severity and the Destination IP with the Highest Severity. It displays the distribution of events by severity and application name. It also contains details regarding event action over time.",
+                            "markdown": "This dashboard shows the Imperva device logs related to this Integration.\n\nThis dashboard is made to provide general statistics and show the detection of the Imperva Securesphere logs.\n\nIt provides information on the Source IP with the Highest Severity and the Destination IP with the Highest Severity. It displays the distribution of events by severity and application name. It also contains details regarding event action over time.",
                             "openLinksInNewTab": false
                         },
                         "title": "",
@@ -53,9 +53,8 @@
                     "y": 0
                 },
                 "panelIndex": "63876b31-8661-4caf-9279-c71fef4ccd66",
-                "title": "Table of Contents",
-                "type": "visualization",
-                "version": "8.10.1"
+                "title": "Overview",
+                "type": "visualization"
             },
             {
                 "embeddableConfig": {
@@ -227,8 +226,7 @@
                 },
                 "panelIndex": "d6a0aa18-fa33-458a-844d-3bd2506d2e48",
                 "title": "Source IP with Highest Severity [Logs Imperva]",
-                "type": "lens",
-                "version": "8.10.1"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -400,8 +398,7 @@
                 },
                 "panelIndex": "2450520f-51b9-45eb-b7f9-1c48f7e1cf46",
                 "title": "Destination IP with Highest Severity [Logs Imperva]",
-                "type": "lens",
-                "version": "8.10.1"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -548,8 +545,7 @@
                 },
                 "panelIndex": "717cc2f1-4a03-4c0d-beb8-ad6cd788ffab",
                 "title": "Event by Severity [Logs Imperva]",
-                "type": "lens",
-                "version": "8.10.1"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -717,8 +713,7 @@
                 },
                 "panelIndex": "60213424-f130-4df2-80d6-89756d764d86",
                 "title": "Event Action over Time [Logs Imperva]",
-                "type": "lens",
-                "version": "8.10.1"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -876,8 +871,7 @@
                 },
                 "panelIndex": "87d56867-8713-46ca-bb70-33495539b3c2",
                 "title": "Event by Application Name [Logs Imperva]",
-                "type": "lens",
-                "version": "8.10.1"
+                "type": "lens"
             }
         ],
         "timeRestore": false,
@@ -885,7 +879,7 @@
         "version": 1
     },
     "coreMigrationVersion": "8.8.0",
-    "created_at": "2023-10-17T05:49:52.349Z",
+    "created_at": "2025-08-14T15:16:42.598Z",
     "id": "imperva-7579f360-69a9-11ee-a2d3-91cb43f7ca23",
     "managed": false,
     "references": [
diff --git a/packages/imperva/manifest.yml b/packages/imperva/manifest.yml
index 1bab58df0a6..f0e5af67929 100644
--- a/packages/imperva/manifest.yml
+++ b/packages/imperva/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 3.0.3
 name: imperva
 title: Imperva
-version: "1.7.1"
+version: "1.8.0"
 description: Collect logs from Imperva devices with Elastic Agent.
 categories: ["network", "security"]
 type: integration
diff --git a/packages/osquery/changelog.yml b/packages/osquery/changelog.yml
index 1562f2163cd..c18cac6bb08 100644
--- a/packages/osquery/changelog.yml
+++ b/packages/osquery/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.24.0"
+  changes:
+    - description: Replace navigation with links panels.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/14938
 - version: "1.23.1"
   changes:
     - description: Changed owners.
diff --git a/packages/osquery/kibana/dashboard/osquery-69f5ae20-eb02-11e7-8f04-51231daa5b05.json b/packages/osquery/kibana/dashboard/osquery-69f5ae20-eb02-11e7-8f04-51231daa5b05.json
index e95fb8e592e..03acda6dcd3 100644
--- a/packages/osquery/kibana/dashboard/osquery-69f5ae20-eb02-11e7-8f04-51231daa5b05.json
+++ b/packages/osquery/kibana/dashboard/osquery-69f5ae20-eb02-11e7-8f04-51231daa5b05.json
@@ -32,8 +32,7 @@
                 },
                 "panelIndex": "1",
                 "panelRefName": "panel_1",
-                "type": "search",
-                "version": "8.7.1"
+                "type": "search"
             },
             {
                 "embeddableConfig": {
@@ -240,8 +239,7 @@
                 },
                 "panelIndex": "2",
                 "title": "Mounts by type [Logs Osquery]",
-                "type": "lens",
-                "version": "8.7.1"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -257,8 +255,7 @@
                 },
                 "panelIndex": "3",
                 "panelRefName": "panel_3",
-                "type": "search",
-                "version": "8.7.1"
+                "type": "search"
             },
             {
                 "embeddableConfig": {
@@ -493,8 +490,7 @@
                 },
                 "panelIndex": "4",
                 "title": "OS versions [Logs Osquery]",
-                "type": "lens",
-                "version": "8.7.1"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -705,57 +701,65 @@
                 },
                 "panelIndex": "5",
                 "title": "Number of Kernel integrations [Logs Osquery]",
-                "type": "lens",
-                "version": "8.7.1"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
-                    "enhancements": {},
-                    "hidePanelTitles": false,
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {
-                                "filter": [],
-                                "query": {
-                                    "language": "kuery",
-                                    "query": ""
-                                }
+                    "attributes": {
+                        "layout": "horizontal",
+                        "links": [
+                            {
+                                "destinationRefName": "link_89c53390-0f46-4f97-a2a5-ba991def24f9_dashboard",
+                                "id": "89c53390-0f46-4f97-a2a5-ba991def24f9",
+                                "label": "Compliance",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 0,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_45c94230-092a-4e76-b156-dab8ebd2a8b1_dashboard",
+                                "id": "45c94230-092a-4e76-b156-dab8ebd2a8b1",
+                                "label": "OSSEC Rootkit",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 1,
+                                "type": "dashboardLink"
                             }
-                        },
-                        "description": "",
-                        "params": {
-                            "fontSize": 10,
-                            "markdown": "**[Compliance](#/dashboard/osquery-69f5ae20-eb02-11e7-8f04-51231daa5b05)** | [OSSEC Rootkit](#/dashboard/osquery-c0a7ce90-f4aa-11e7-8647-534bb4c21040)",
-                            "openLinksInNewTab": false
-                        },
-                        "title": "Navigation [Logs Osquery]",
-                        "type": "markdown",
-                        "uiState": {}
-                    }
+                        ]
+                    },
+                    "disabledActions": [
+                        "OPEN_FLYOUT_ADD_DRILLDOWN"
+                    ],
+                    "enhancements": {},
+                    "hidePanelTitles": false
                 },
                 "gridData": {
                     "h": 4,
-                    "i": "6",
+                    "i": "ecd4c927-8315-4b2e-9b88-e3e01ad94eea",
                     "w": 20,
                     "x": 0,
                     "y": 0
                 },
-                "panelIndex": "6",
-                "type": "visualization",
-                "version": "8.7.1"
+                "panelIndex": "ecd4c927-8315-4b2e-9b88-e3e01ad94eea",
+                "title": "Navigation [Logs Osquery]",
+                "type": "links"
             }
         ],
         "timeRestore": false,
         "title": "[Logs Osquery] Compliance pack",
         "version": 1
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-05T15:36:32.305Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T19:31:37.304Z",
     "id": "osquery-69f5ae20-eb02-11e7-8f04-51231daa5b05",
-    "migrationVersion": {
-        "dashboard": "8.7.0"
-    },
+    "managed": false,
     "references": [
         {
             "id": "osquery-7a9482d0-eb00-11e7-8f04-51231daa5b05",
@@ -811,7 +815,23 @@
             "id": "logs-*",
             "name": "5:e17eb83f-a478-4fd7-832c-b491c7659bb7",
             "type": "index-pattern"
+        },
+        {
+            "id": "osquery-69f5ae20-eb02-11e7-8f04-51231daa5b05",
+            "name": "ecd4c927-8315-4b2e-9b88-e3e01ad94eea:link_89c53390-0f46-4f97-a2a5-ba991def24f9_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "osquery-c0a7ce90-f4aa-11e7-8647-534bb4c21040",
+            "name": "ecd4c927-8315-4b2e-9b88-e3e01ad94eea:link_45c94230-092a-4e76-b156-dab8ebd2a8b1_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "osquery-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "dashboard"
+    "type": "dashboard",
+    "typeMigrationVersion": "8.9.0"
 }
\ No newline at end of file
diff --git a/packages/osquery/kibana/dashboard/osquery-c0a7ce90-f4aa-11e7-8647-534bb4c21040.json b/packages/osquery/kibana/dashboard/osquery-c0a7ce90-f4aa-11e7-8647-534bb4c21040.json
index 298d0ad2c31..aa420a14edf 100644
--- a/packages/osquery/kibana/dashboard/osquery-c0a7ce90-f4aa-11e7-8647-534bb4c21040.json
+++ b/packages/osquery/kibana/dashboard/osquery-c0a7ce90-f4aa-11e7-8647-534bb4c21040.json
@@ -52,8 +52,7 @@
                     "y": 0
                 },
                 "panelIndex": "1",
-                "type": "visualization",
-                "version": "8.7.1"
+                "type": "visualization"
             },
             {
                 "embeddableConfig": {
@@ -228,8 +227,7 @@
                 },
                 "panelIndex": "2",
                 "title": "Number of rootkits found [Logs Osquery]",
-                "type": "lens",
-                "version": "8.7.1"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
@@ -404,74 +402,76 @@
                 },
                 "panelIndex": "3",
                 "title": "Number of hosts infected [Logs Osquery]",
-                "type": "lens",
-                "version": "8.7.1"
+                "type": "lens"
             },
             {
                 "embeddableConfig": {
                     "enhancements": {},
-                    "hidePanelTitles": false,
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {
-                                "filter": [],
-                                "query": {
-                                    "language": "kuery",
-                                    "query": ""
-                                }
-                            }
-                        },
-                        "description": "",
-                        "params": {
-                            "fontSize": 10,
-                            "markdown": "[Compliance](#/dashboard/osquery-69f5ae20-eb02-11e7-8f04-51231daa5b05) | **[OSSEC Rootkit](#/dashboard/osquery-c0a7ce90-f4aa-11e7-8647-534bb4c21040)**",
-                            "openLinksInNewTab": false
-                        },
-                        "title": "Navigation [Logs Osquery]",
-                        "type": "markdown",
-                        "uiState": {}
-                    }
+                    "hidePanelTitles": false
                 },
                 "gridData": {
-                    "h": 5,
-                    "i": "4",
-                    "w": 19,
+                    "h": 21,
+                    "i": "5",
+                    "w": 48,
                     "x": 0,
-                    "y": 0
+                    "y": 5
                 },
-                "panelIndex": "4",
-                "type": "visualization",
-                "version": "8.7.1"
+                "panelIndex": "5",
+                "panelRefName": "panel_5",
+                "type": "search"
             },
             {
                 "embeddableConfig": {
+                    "attributes": {
+                        "layout": "horizontal",
+                        "links": [
+                            {
+                                "destinationRefName": "link_0ce3cc72-b9d0-4c4c-bc7e-c5081669468e_dashboard",
+                                "id": "0ce3cc72-b9d0-4c4c-bc7e-c5081669468e",
+                                "label": "Compliance",
+                                "order": 0,
+                                "type": "dashboardLink"
+                            },
+                            {
+                                "destinationRefName": "link_b4ab02f3-dbed-43cd-b3b8-4a45b5cd6f3d_dashboard",
+                                "id": "b4ab02f3-dbed-43cd-b3b8-4a45b5cd6f3d",
+                                "label": "OSSEC Rootkit",
+                                "options": {
+                                    "openInNewTab": false,
+                                    "useCurrentDateRange": true,
+                                    "useCurrentFilters": false
+                                },
+                                "order": 1,
+                                "type": "dashboardLink"
+                            }
+                        ]
+                    },
+                    "disabledActions": [
+                        "OPEN_FLYOUT_ADD_DRILLDOWN"
+                    ],
                     "enhancements": {},
                     "hidePanelTitles": false
                 },
                 "gridData": {
-                    "h": 21,
-                    "i": "5",
-                    "w": 48,
+                    "h": 5,
+                    "i": "3d4aa9f4-9ff7-4044-a118-3f1d618dbf0d",
+                    "w": 19,
                     "x": 0,
-                    "y": 5
+                    "y": 0
                 },
-                "panelIndex": "5",
-                "panelRefName": "panel_5",
-                "type": "search",
-                "version": "8.7.1"
+                "panelIndex": "3d4aa9f4-9ff7-4044-a118-3f1d618dbf0d",
+                "title": "Navigation [Logs Osquery]",
+                "type": "links"
             }
         ],
         "timeRestore": false,
         "title": "[Logs Osquery] OSSEC rootkit pack",
         "version": 1
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-05T15:40:07.447Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T19:33:02.577Z",
     "id": "osquery-c0a7ce90-f4aa-11e7-8647-534bb4c21040",
-    "migrationVersion": {
-        "dashboard": "8.7.0"
-    },
+    "managed": false,
     "references": [
         {
             "id": "logs-*",
@@ -497,7 +497,23 @@
             "id": "osquery-0fe5dc00-f49b-11e7-8647-534bb4c21040",
             "name": "5:panel_5",
             "type": "search"
+        },
+        {
+            "id": "osquery-69f5ae20-eb02-11e7-8f04-51231daa5b05",
+            "name": "3d4aa9f4-9ff7-4044-a118-3f1d618dbf0d:link_0ce3cc72-b9d0-4c4c-bc7e-c5081669468e_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "osquery-c0a7ce90-f4aa-11e7-8647-534bb4c21040",
+            "name": "3d4aa9f4-9ff7-4044-a118-3f1d618dbf0d:link_b4ab02f3-dbed-43cd-b3b8-4a45b5cd6f3d_dashboard",
+            "type": "dashboard"
+        },
+        {
+            "id": "osquery-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "dashboard"
+    "type": "dashboard",
+    "typeMigrationVersion": "8.9.0"
 }
\ No newline at end of file
diff --git a/packages/osquery/kibana/search/osquery-0fe5dc00-f49b-11e7-8647-534bb4c21040.json b/packages/osquery/kibana/search/osquery-0fe5dc00-f49b-11e7-8647-534bb4c21040.json
index 253786274fd..5a533db43ea 100644
--- a/packages/osquery/kibana/search/osquery-0fe5dc00-f49b-11e7-8647-534bb4c21040.json
+++ b/packages/osquery/kibana/search/osquery-0fe5dc00-f49b-11e7-8647-534bb4c21040.json
@@ -88,12 +88,10 @@
         "usesAdHocDataView": false,
         "version": 1
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-05T15:08:40.640Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T19:27:22.566Z",
     "id": "osquery-0fe5dc00-f49b-11e7-8647-534bb4c21040",
-    "migrationVersion": {
-        "search": "8.0.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
@@ -104,7 +102,13 @@
             "id": "logs-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
             "type": "index-pattern"
+        },
+        {
+            "id": "osquery-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "search"
+    "type": "search",
+    "typeMigrationVersion": "8.0.0"
 }
\ No newline at end of file
diff --git a/packages/osquery/kibana/search/osquery-3824b080-eb02-11e7-8f04-51231daa5b05.json b/packages/osquery/kibana/search/osquery-3824b080-eb02-11e7-8f04-51231daa5b05.json
index 81f9c4ecb55..105884062c9 100644
--- a/packages/osquery/kibana/search/osquery-3824b080-eb02-11e7-8f04-51231daa5b05.json
+++ b/packages/osquery/kibana/search/osquery-3824b080-eb02-11e7-8f04-51231daa5b05.json
@@ -88,12 +88,10 @@
         "usesAdHocDataView": false,
         "version": 1
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-05T15:08:40.640Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T19:27:22.566Z",
     "id": "osquery-3824b080-eb02-11e7-8f04-51231daa5b05",
-    "migrationVersion": {
-        "search": "8.0.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
@@ -104,7 +102,13 @@
             "id": "logs-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
             "type": "index-pattern"
+        },
+        {
+            "id": "osquery-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "search"
+    "type": "search",
+    "typeMigrationVersion": "8.0.0"
 }
\ No newline at end of file
diff --git a/packages/osquery/kibana/search/osquery-7a9482d0-eb00-11e7-8f04-51231daa5b05.json b/packages/osquery/kibana/search/osquery-7a9482d0-eb00-11e7-8f04-51231daa5b05.json
index c773bd59ab3..fc2876b77ec 100644
--- a/packages/osquery/kibana/search/osquery-7a9482d0-eb00-11e7-8f04-51231daa5b05.json
+++ b/packages/osquery/kibana/search/osquery-7a9482d0-eb00-11e7-8f04-51231daa5b05.json
@@ -88,12 +88,10 @@
         "usesAdHocDataView": false,
         "version": 1
     },
-    "coreMigrationVersion": "8.7.1",
-    "created_at": "2023-07-05T15:08:40.640Z",
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T19:27:22.566Z",
     "id": "osquery-7a9482d0-eb00-11e7-8f04-51231daa5b05",
-    "migrationVersion": {
-        "search": "8.0.0"
-    },
+    "managed": true,
     "references": [
         {
             "id": "logs-*",
@@ -104,7 +102,13 @@
             "id": "logs-*",
             "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
             "type": "index-pattern"
+        },
+        {
+            "id": "osquery-security-solution-default",
+            "name": "tag-ref-security-solution-default",
+            "type": "tag"
         }
     ],
-    "type": "search"
+    "type": "search",
+    "typeMigrationVersion": "8.0.0"
 }
\ No newline at end of file
diff --git a/packages/osquery/kibana/tag/osquery-security-solution-default.json b/packages/osquery/kibana/tag/osquery-security-solution-default.json
new file mode 100644
index 00000000000..a9321583e12
--- /dev/null
+++ b/packages/osquery/kibana/tag/osquery-security-solution-default.json
@@ -0,0 +1,14 @@
+{
+    "attributes": {
+        "color": "#A0A0A0",
+        "description": "Tag defined in package-spec",
+        "name": "Security Solution"
+    },
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-08-20T19:27:22.637Z",
+    "id": "osquery-security-solution-default",
+    "managed": false,
+    "references": [],
+    "type": "tag",
+    "typeMigrationVersion": "8.0.0"
+}
\ No newline at end of file
diff --git a/packages/osquery/manifest.yml b/packages/osquery/manifest.yml
index ab17d059541..d927ddaba2d 100644
--- a/packages/osquery/manifest.yml
+++ b/packages/osquery/manifest.yml
@@ -1,6 +1,6 @@
 name: osquery
 title: Osquery Logs
-version: "1.23.1"
+version: "1.24.0"
 description: Collect logs from Osquery with Elastic Agent.
 type: integration
 icons: