diff --git a/packages/system/changelog.yml b/packages/system/changelog.yml
index 47a96be28f0..3b03dd192b5 100644
--- a/packages/system/changelog.yml
+++ b/packages/system/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "2.4.0"
+  changes:
+    - description: Use Links panel in Dashboards
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/14383
 - version: "2.3.3"
   changes:
     - description: Fix CPU Usage on [Metrics System] Overview "hosts" tab.
diff --git a/packages/system/kibana/dashboard/system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab.json b/packages/system/kibana/dashboard/system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab.json
index 4280e6bf5ef..12ee5a44221 100644
--- a/packages/system/kibana/dashboard/system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab.json
+++ b/packages/system/kibana/dashboard/system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab.json
@@ -55,20 +55,39 @@
             {
                 "embeddableConfig": {
                     "enhancements": {},
-                    "hidePanelTitles": false,
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {}
-                        },
-                        "description": "",
-                        "params": {
-                            "fontSize": 12,
-                            "markdown": "[Syslog](#/dashboard/system-Logs-syslog-dashboard) | [Sudo commands](#/dashboard/system-277876d0-fa2c-11e6-bbd3-29c986c96e5a) | [SSH logins](#/dashboard/system-5517a150-f9ce-11e6-8115-a7c18106d86a) | [New users and groups](#/dashboard/system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab)"
-                        },
-                        "title": "Dashboards [Logs System]",
-                        "type": "markdown",
-                        "uiState": {}
+                    "attributes": {
+                        "title": "links",
+                        "layout": "horizontal",
+                        "links": [
+                            {
+                                "label": "Syslog",
+                                "type": "dashboardLink",
+                                "id": "system-Logs-syslog-dashboard",
+                                "order": 0,
+                                "destinationRefName": "link_system-Logs-syslog-dashboard_dashboard"
+                            },
+                            {
+                                "label": "Sudo commands",
+                                "type": "dashboardLink",
+                                "id": "system-277876d0-fa2c-11e6-bbd3-29c986c96e5a",
+                                "order": 1,
+                                "destinationRefName": "link_system-277876d0-fa2c-11e6-bbd3-29c986c96e5a_dashboard"
+                            },
+                            {
+                                "label": "SSH logins",
+                                "type": "dashboardLink",
+                                "id": "system-5517a150-f9ce-11e6-8115-a7c18106d86a",
+                                "order": 2,
+                                "destinationRefName": "link_system-5517a150-f9ce-11e6-8115-a7c18106d86a_dashboard"
+                            },
+                            {
+                                "label": "New users and groups",
+                                "type": "dashboardLink",
+                                "id": "system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab",
+                                "order": 3,
+                                "destinationRefName": "link_system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab_dashboard"
+                            }
+                        ]
                     }
                 },
                 "gridData": {
@@ -80,8 +99,7 @@
                 },
                 "panelIndex": "7",
                 "title": "Dashboards",
-                "type": "visualization",
-                "version": "8.10.2"
+                "type": "links"
             },
             {
                 "embeddableConfig": {
@@ -1225,6 +1243,26 @@
             "id": "logs-*",
             "name": "edc0a4ad-a2f9-4ae8-93ca-cfd7d0ed40fe:indexpattern-datasource-layer-c85d2e3b-2a8a-4312-a206-a0aea0b03d03",
             "type": "index-pattern"
+        },
+        {
+            "name": "7:link_system-Logs-syslog-dashboard_dashboard",
+            "type": "dashboard",
+            "id": "system-Logs-syslog-dashboard"
+        },
+        {
+            "name": "7:link_system-277876d0-fa2c-11e6-bbd3-29c986c96e5a_dashboard",
+            "type": "dashboard",
+            "id": "system-277876d0-fa2c-11e6-bbd3-29c986c96e5a"
+        },
+        {
+            "name": "7:link_system-5517a150-f9ce-11e6-8115-a7c18106d86a_dashboard",
+            "type": "dashboard",
+            "id": "system-5517a150-f9ce-11e6-8115-a7c18106d86a"
+        },
+        {
+            "name": "7:link_system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab_dashboard",
+            "type": "dashboard",
+            "id": "system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab"
         }
     ],
     "managed": false,
diff --git a/packages/system/kibana/dashboard/system-277876d0-fa2c-11e6-bbd3-29c986c96e5a.json b/packages/system/kibana/dashboard/system-277876d0-fa2c-11e6-bbd3-29c986c96e5a.json
index fa237a08011..37f98b7a18b 100644
--- a/packages/system/kibana/dashboard/system-277876d0-fa2c-11e6-bbd3-29c986c96e5a.json
+++ b/packages/system/kibana/dashboard/system-277876d0-fa2c-11e6-bbd3-29c986c96e5a.json
@@ -55,20 +55,39 @@
             {
                 "embeddableConfig": {
                     "enhancements": {},
-                    "hidePanelTitles": false,
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {}
-                        },
-                        "description": "",
-                        "params": {
-                            "fontSize": 12,
-                            "markdown": "[Syslog](#/dashboard/system-Logs-syslog-dashboard) | [Sudo commands](#/dashboard/system-277876d0-fa2c-11e6-bbd3-29c986c96e5a) | [SSH logins](#/dashboard/system-5517a150-f9ce-11e6-8115-a7c18106d86a) | [New users and groups](#/dashboard/system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab)"
-                        },
-                        "title": "Dashboards [Logs System]",
-                        "type": "markdown",
-                        "uiState": {}
+                    "attributes": {
+                        "title": "links",
+                        "layout": "horizontal",
+                        "links": [
+                            {
+                                "label": "Syslog",
+                                "type": "dashboardLink",
+                                "id": "system-Logs-syslog-dashboard",
+                                "order": 0,
+                                "destinationRefName": "link_system-Logs-syslog-dashboard_dashboard"
+                            },
+                            {
+                                "label": "Sudo commands",
+                                "type": "dashboardLink",
+                                "id": "system-277876d0-fa2c-11e6-bbd3-29c986c96e5a",
+                                "order": 1,
+                                "destinationRefName": "link_system-277876d0-fa2c-11e6-bbd3-29c986c96e5a_dashboard"
+                            },
+                            {
+                                "label": "SSH logins",
+                                "type": "dashboardLink",
+                                "id": "system-5517a150-f9ce-11e6-8115-a7c18106d86a",
+                                "order": 2,
+                                "destinationRefName": "link_system-5517a150-f9ce-11e6-8115-a7c18106d86a_dashboard"
+                            },
+                            {
+                                "label": "New users and groups",
+                                "type": "dashboardLink",
+                                "id": "system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab",
+                                "order": 3,
+                                "destinationRefName": "link_system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab_dashboard"
+                            }
+                        ]
                     }
                 },
                 "gridData": {
@@ -80,8 +99,7 @@
                 },
                 "panelIndex": "4",
                 "title": "Dashboards",
-                "type": "visualization",
-                "version": "8.10.2"
+                "type": "links"
             },
             {
                 "embeddableConfig": {
@@ -682,6 +700,26 @@
             "id": "logs-*",
             "name": "fd4d0b9e-760d-4d7a-90e9-62aca0609b9e:5f8ad652-efdd-4a71-a6c7-b14538243381",
             "type": "index-pattern"
+        },
+        {
+            "name": "4:link_system-Logs-syslog-dashboard_dashboard",
+            "type": "dashboard",
+            "id": "system-Logs-syslog-dashboard"
+        },
+        {
+            "name": "4:link_system-277876d0-fa2c-11e6-bbd3-29c986c96e5a_dashboard",
+            "type": "dashboard",
+            "id": "system-277876d0-fa2c-11e6-bbd3-29c986c96e5a"
+        },
+        {
+            "name": "4:link_system-5517a150-f9ce-11e6-8115-a7c18106d86a_dashboard",
+            "type": "dashboard",
+            "id": "system-5517a150-f9ce-11e6-8115-a7c18106d86a"
+        },
+        {
+            "name": "4:link_system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab_dashboard",
+            "type": "dashboard",
+            "id": "system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab"
         }
     ],
     "managed": false,
diff --git a/packages/system/kibana/dashboard/system-5517a150-f9ce-11e6-8115-a7c18106d86a.json b/packages/system/kibana/dashboard/system-5517a150-f9ce-11e6-8115-a7c18106d86a.json
index 01288c4ace0..dda91da9612 100644
--- a/packages/system/kibana/dashboard/system-5517a150-f9ce-11e6-8115-a7c18106d86a.json
+++ b/packages/system/kibana/dashboard/system-5517a150-f9ce-11e6-8115-a7c18106d86a.json
@@ -55,20 +55,39 @@
             {
                 "embeddableConfig": {
                     "enhancements": {},
-                    "hidePanelTitles": false,
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {}
-                        },
-                        "description": "",
-                        "params": {
-                            "fontSize": 12,
-                            "markdown": "[Syslog](#/dashboard/system-Logs-syslog-dashboard) | [Sudo commands](#/dashboard/system-277876d0-fa2c-11e6-bbd3-29c986c96e5a) | [SSH logins](#/dashboard/system-5517a150-f9ce-11e6-8115-a7c18106d86a) | [New users and groups](#/dashboard/system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab)"
-                        },
-                        "title": "Dashboards [Logs System]",
-                        "type": "markdown",
-                        "uiState": {}
+                    "attributes": {
+                        "title": "links",
+                        "layout": "horizontal",
+                        "links": [
+                            {
+                                "label": "Syslog",
+                                "type": "dashboardLink",
+                                "id": "system-Logs-syslog-dashboard",
+                                "order": 0,
+                                "destinationRefName": "link_system-Logs-syslog-dashboard_dashboard"
+                            },
+                            {
+                                "label": "Sudo commands",
+                                "type": "dashboardLink",
+                                "id": "system-277876d0-fa2c-11e6-bbd3-29c986c96e5a",
+                                "order": 1,
+                                "destinationRefName": "link_system-277876d0-fa2c-11e6-bbd3-29c986c96e5a_dashboard"
+                            },
+                            {
+                                "label": "SSH logins",
+                                "type": "dashboardLink",
+                                "id": "system-5517a150-f9ce-11e6-8115-a7c18106d86a",
+                                "order": 2,
+                                "destinationRefName": "link_system-5517a150-f9ce-11e6-8115-a7c18106d86a_dashboard"
+                            },
+                            {
+                                "label": "New users and groups",
+                                "type": "dashboardLink",
+                                "id": "system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab",
+                                "order": 3,
+                                "destinationRefName": "link_system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab_dashboard"
+                            }
+                        ]
                     }
                 },
                 "gridData": {
@@ -80,8 +99,7 @@
                 },
                 "panelIndex": "6",
                 "title": "Dashboards",
-                "type": "visualization",
-                "version": "8.10.2"
+                "type": "links"
             },
             {
                 "embeddableConfig": {
@@ -783,6 +801,26 @@
             "id": "logs-*",
             "name": "f33947eb-0ae3-436c-889a-bb8450143b57:kibanaSavedObjectMeta.searchSourceJSON.index",
             "type": "index-pattern"
+        },
+        {
+            "name": "6:link_system-Logs-syslog-dashboard_dashboard",
+            "type": "dashboard",
+            "id": "system-Logs-syslog-dashboard"
+        },
+        {
+            "name": "6:link_system-277876d0-fa2c-11e6-bbd3-29c986c96e5a_dashboard",
+            "type": "dashboard",
+            "id": "system-277876d0-fa2c-11e6-bbd3-29c986c96e5a"
+        },
+        {
+            "name": "6:link_system-5517a150-f9ce-11e6-8115-a7c18106d86a_dashboard",
+            "type": "dashboard",
+            "id": "system-5517a150-f9ce-11e6-8115-a7c18106d86a"
+        },
+        {
+            "name": "6:link_system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab_dashboard",
+            "type": "dashboard",
+            "id": "system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab"
         }
     ],
     "managed": false,
diff --git a/packages/system/kibana/dashboard/system-71f720f0-ff18-11e9-8405-516218e3d268.json b/packages/system/kibana/dashboard/system-71f720f0-ff18-11e9-8405-516218e3d268.json
index ebf5b380044..993c71a2f4c 100644
--- a/packages/system/kibana/dashboard/system-71f720f0-ff18-11e9-8405-516218e3d268.json
+++ b/packages/system/kibana/dashboard/system-71f720f0-ff18-11e9-8405-516218e3d268.json
@@ -2079,26 +2079,46 @@
             {
                 "embeddableConfig": {
                     "enhancements": {},
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {
-                                "filter": [],
-                                "query": {
-                                    "language": "kuery",
-                                    "query": ""
-                                }
+                    "attributes": {
+                        "title": "links",
+                        "layout": "horizontal",
+                        "links": [
+                            {
+                                "label": "Windows Overview",
+                                "type": "dashboardLink",
+                                "id": "system-Windows-Dashboard",
+                                "order": 0,
+                                "destinationRefName": "link_system-Windows-Dashboard_dashboard"
+                            },
+                            {
+                                "label": "User Logon Information",
+                                "type": "dashboardLink",
+                                "id": "system-bae11b00-9bfc-11ea-87e4-49f31ec44891",
+                                "order": 1,
+                                "destinationRefName": "link_system-bae11b00-9bfc-11ea-87e4-49f31ec44891_dashboard"
+                            },
+                            {
+                                "label": "Logon Failed and Account Lockout",
+                                "type": "dashboardLink",
+                                "id": "system-d401ef40-a7d5-11e9-a422-d144027429da",
+                                "order": 2,
+                                "destinationRefName": "link_system-d401ef40-a7d5-11e9-a422-d144027429da_dashboard"
+                            },
+                            {
+                                "label": "User Management Events",
+                                "type": "dashboardLink",
+                                "id": "system-71f720f0-ff18-11e9-8405-516218e3d268",
+                                "order": 3,
+                                "destinationRefName": "link_system-71f720f0-ff18-11e9-8405-516218e3d268_dashboard"
+                            },
+                            {
+                                "label": "Group Management Events",
+                                "type": "dashboardLink",
+                                "id": "system-bb858830-f412-11e9-8405-516218e3d268",
+                                "order": 4,
+                                "destinationRefName": "link_system-bb858830-f412-11e9-8405-516218e3d268_dashboard"
                             }
-                        },
-                        "description": "",
-                        "params": {
-                            "fontSize": 12,
-                            "markdown": "[Windows Overview](#/dashboard/system-Windows-Dashboard) | [User Logon Information](#/dashboard/system-bae11b00-9bfc-11ea-87e4-49f31ec44891) |  [Logon Failed and Account Lockout](#/dashboard/system-d401ef40-a7d5-11e9-a422-d144027429da) | **User Management Events** | [Group Management Events](#/dashboard/system-bb858830-f412-11e9-8405-516218e3d268)",
-                            "openLinksInNewTab": false
-                        },
-                        "title": "Dashboard links  [Windows System Security]",
-                        "type": "markdown",
-                        "uiState": {}
+                        ]
                     }
                 },
                 "gridData": {
@@ -2110,7 +2130,7 @@
                 },
                 "panelIndex": "cf0adfac-7cf2-479d-8ddb-1edeee62d37c",
                 "title": "",
-                "type": "visualization"
+                "type": "links"
             },
             {
                 "embeddableConfig": {
@@ -4582,6 +4602,31 @@
             "id": "logs-*",
             "name": "1ec8b993-9ac1-4c7f-b7f7-5136f2e310aa:d44e7ad4-f711-4e53-a4ae-b9cb03867c5f",
             "type": "index-pattern"
+        },
+        {
+            "name": "cf0adfac-7cf2-479d-8ddb-1edeee62d37c:link_system-Windows-Dashboard_dashboard",
+            "type": "dashboard",
+            "id": "system-Windows-Dashboard"
+        },
+        {
+            "name": "cf0adfac-7cf2-479d-8ddb-1edeee62d37c:link_system-bae11b00-9bfc-11ea-87e4-49f31ec44891_dashboard",
+            "type": "dashboard",
+            "id": "system-bae11b00-9bfc-11ea-87e4-49f31ec44891"
+        },
+        {
+            "name": "cf0adfac-7cf2-479d-8ddb-1edeee62d37c:link_system-d401ef40-a7d5-11e9-a422-d144027429da_dashboard",
+            "type": "dashboard",
+            "id": "system-d401ef40-a7d5-11e9-a422-d144027429da"
+        },
+        {
+            "name": "cf0adfac-7cf2-479d-8ddb-1edeee62d37c:link_system-71f720f0-ff18-11e9-8405-516218e3d268_dashboard",
+            "type": "dashboard",
+            "id": "system-71f720f0-ff18-11e9-8405-516218e3d268"
+        },
+        {
+            "name": "cf0adfac-7cf2-479d-8ddb-1edeee62d37c:link_system-bb858830-f412-11e9-8405-516218e3d268_dashboard",
+            "type": "dashboard",
+            "id": "system-bb858830-f412-11e9-8405-516218e3d268"
         }
     ],
     "type": "dashboard",
diff --git a/packages/system/kibana/dashboard/system-79ffd6e0-faa0-11e6-947f-177f697178b8.json b/packages/system/kibana/dashboard/system-79ffd6e0-faa0-11e6-947f-177f697178b8.json
index b877b1d1bdf..370989c3d7e 100644
--- a/packages/system/kibana/dashboard/system-79ffd6e0-faa0-11e6-947f-177f697178b8.json
+++ b/packages/system/kibana/dashboard/system-79ffd6e0-faa0-11e6-947f-177f697178b8.json
@@ -124,7 +124,7 @@
                     "y": 0
                 },
                 "panelIndex": "fcb53f5b-0e6b-41c8-ae1c-e2aafdeaff5a",
-                "title": "System Navigation [Metrics System]",
+                "title": "System Navigation",
                 "type": "visualization"
             },
             {
diff --git a/packages/system/kibana/dashboard/system-Logs-syslog-dashboard.json b/packages/system/kibana/dashboard/system-Logs-syslog-dashboard.json
index 9bd52c99669..aa66cdc2919 100644
--- a/packages/system/kibana/dashboard/system-Logs-syslog-dashboard.json
+++ b/packages/system/kibana/dashboard/system-Logs-syslog-dashboard.json
@@ -44,21 +44,39 @@
             {
                 "embeddableConfig": {
                     "enhancements": {},
-                    "hidePanelTitles": false,
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {}
-                        },
-                        "description": "",
-                        "params": {
-                            "fontSize": 12,
-                            "markdown": "[Syslog](#/dashboard/system-Logs-syslog-dashboard) | [Sudo commands](#/dashboard/system-277876d0-fa2c-11e6-bbd3-29c986c96e5a) | [SSH logins](#/dashboard/system-5517a150-f9ce-11e6-8115-a7c18106d86a) | [New users and groups](#/dashboard/system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab)",
-                            "openLinksInNewTab": false
-                        },
-                        "title": "Dashboards [Logs System]",
-                        "type": "markdown",
-                        "uiState": {}
+                    "attributes": {
+                        "title": "links",
+                        "layout": "horizontal",
+                        "links": [
+                            {
+                                "label": "Syslog",
+                                "type": "dashboardLink",
+                                "id": "system-Logs-syslog-dashboard",
+                                "order": 0,
+                                "destinationRefName": "link_system-Logs-syslog-dashboard_dashboard"
+                            },
+                            {
+                                "label": "Sudo commands",
+                                "type": "dashboardLink",
+                                "id": "system-277876d0-fa2c-11e6-bbd3-29c986c96e5a",
+                                "order": 1,
+                                "destinationRefName": "link_system-277876d0-fa2c-11e6-bbd3-29c986c96e5a_dashboard"
+                            },
+                            {
+                                "label": "SSH logins",
+                                "type": "dashboardLink",
+                                "id": "system-5517a150-f9ce-11e6-8115-a7c18106d86a",
+                                "order": 2,
+                                "destinationRefName": "link_system-5517a150-f9ce-11e6-8115-a7c18106d86a_dashboard"
+                            },
+                            {
+                                "label": "New users and groups",
+                                "type": "dashboardLink",
+                                "id": "system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab",
+                                "order": 3,
+                                "destinationRefName": "link_system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab_dashboard"
+                            }
+                        ]
                     }
                 },
                 "gridData": {
@@ -70,7 +88,7 @@
                 },
                 "panelIndex": "4",
                 "title": "Dashboards",
-                "type": "visualization"
+                "type": "links"
             },
             {
                 "embeddableConfig": {
@@ -486,6 +504,26 @@
             "id": "logs-*",
             "name": "f08ec141-4b46-4e87-9b1c-3bb1bb502d3e:kibanaSavedObjectMeta.searchSourceJSON.index",
             "type": "index-pattern"
+        },
+        {
+            "name": "4:link_system-Logs-syslog-dashboard_dashboard",
+            "type": "dashboard",
+            "id": "system-Logs-syslog-dashboard"
+        },
+        {
+            "name": "4:link_system-277876d0-fa2c-11e6-bbd3-29c986c96e5a_dashboard",
+            "type": "dashboard",
+            "id": "system-277876d0-fa2c-11e6-bbd3-29c986c96e5a"
+        },
+        {
+            "name": "4:link_system-5517a150-f9ce-11e6-8115-a7c18106d86a_dashboard",
+            "type": "dashboard",
+            "id": "system-5517a150-f9ce-11e6-8115-a7c18106d86a"
+        },
+        {
+            "name": "4:link_system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab_dashboard",
+            "type": "dashboard",
+            "id": "system-0d3f2380-fa78-11e6-ae9b-81e5311e8cab"
         }
     ],
     "type": "dashboard",
diff --git a/packages/system/kibana/dashboard/system-Metrics-system-overview.json b/packages/system/kibana/dashboard/system-Metrics-system-overview.json
index ac600e8f329..7560895dd6e 100644
--- a/packages/system/kibana/dashboard/system-Metrics-system-overview.json
+++ b/packages/system/kibana/dashboard/system-Metrics-system-overview.json
@@ -106,7 +106,7 @@
                     "y": 0
                 },
                 "panelIndex": "471f7546-e704-4a38-a041-d8b11869d7cc",
-                "title": "System Navigation [Metrics System]",
+                "title": "System Navigation",
                 "type": "visualization"
             },
             {
diff --git a/packages/system/kibana/dashboard/system-Windows-Dashboard.json b/packages/system/kibana/dashboard/system-Windows-Dashboard.json
index 7a900127d04..67cf42c0943 100644
--- a/packages/system/kibana/dashboard/system-Windows-Dashboard.json
+++ b/packages/system/kibana/dashboard/system-Windows-Dashboard.json
@@ -115,7 +115,7 @@
             "syncColors": false,
             "syncCursor": true,
             "syncTooltips": false,
-            "useMargins": true
+            "useMargins": false
         },
         "panelsJSON": [
             {
@@ -230,8 +230,50 @@
                 "title": "Number of Events [Windows Overview]"
             },
             {
-                "version": "8.9.0",
-                "type": "visualization",
+                "embeddableConfig": {
+                    "enhancements": {},
+                    "attributes": {
+                        "title": "links",
+                        "layout": "horizontal",
+                        "links": [
+                            {
+                                "label": "Windows Overview",
+                                "type": "dashboardLink",
+                                "id": "system-Windows-Dashboard",
+                                "order": 0,
+                                "destinationRefName": "link_system-Windows-Dashboard_dashboard"
+                            },
+                            {
+                                "label": "User Logon Information",
+                                "type": "dashboardLink",
+                                "id": "system-bae11b00-9bfc-11ea-87e4-49f31ec44891",
+                                "order": 1,
+                                "destinationRefName": "link_system-bae11b00-9bfc-11ea-87e4-49f31ec44891_dashboard"
+                            },
+                            {
+                                "label": "Logon Failed and Account Lockout",
+                                "type": "dashboardLink",
+                                "id": "system-d401ef40-a7d5-11e9-a422-d144027429da",
+                                "order": 2,
+                                "destinationRefName": "link_system-d401ef40-a7d5-11e9-a422-d144027429da_dashboard"
+                            },
+                            {
+                                "label": "User Management Events",
+                                "type": "dashboardLink",
+                                "id": "system-71f720f0-ff18-11e9-8405-516218e3d268",
+                                "order": 3,
+                                "destinationRefName": "link_system-71f720f0-ff18-11e9-8405-516218e3d268_dashboard"
+                            },
+                            {
+                                "label": "Group Management Events",
+                                "type": "dashboardLink",
+                                "id": "system-bb858830-f412-11e9-8405-516218e3d268",
+                                "order": 4,
+                                "destinationRefName": "link_system-bb858830-f412-11e9-8405-516218e3d268_dashboard"
+                            }
+                        ]
+                    }
+                },
                 "gridData": {
                     "h": 5,
                     "i": "dadfa90b-35df-4cdb-8b7f-80b75ef8cb9b",
@@ -240,32 +282,8 @@
                     "y": 0
                 },
                 "panelIndex": "dadfa90b-35df-4cdb-8b7f-80b75ef8cb9b",
-                "embeddableConfig": {
-                    "enhancements": {},
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {
-                                "filter": [],
-                                "query": {
-                                    "language": "kuery",
-                                    "query": ""
-                                }
-                            }
-                        },
-                        "description": "",
-                        "params": {
-                            "fontSize": 12,
-                            "markdown": "**Windows Overview** | [User Logon Information](#/dashboard/system-bae11b00-9bfc-11ea-87e4-49f31ec44891) |  [Logon Failed and Account Lockout](#/dashboard/system-d401ef40-a7d5-11e9-a422-d144027429da) | [User Management Events](#/dashboard/system-71f720f0-ff18-11e9-8405-516218e3d268) | [Group Management Events](#/dashboard/system-bb858830-f412-11e9-8405-516218e3d268)",
-                            "openLinksInNewTab": false
-                        },
-                        "title": "Dashboard links  [Windows System Security]",
-                        "type": "markdown",
-                        "uiState": {}
-                    },
-                    "type": "visualization"
-                },
-                "title": ""
+                "title": "",
+                "type": "links"
             },
             {
                 "version": "8.9.0",
@@ -821,6 +839,31 @@
             "id": "logs-*",
             "name": "8f939618-5923-43d4-9b23-57f7d21b4908:indexpattern-datasource-layer-948e4465-d614-4c5c-845c-e2cc11f14b14",
             "type": "index-pattern"
+        },
+        {
+            "name": "dadfa90b-35df-4cdb-8b7f-80b75ef8cb9b:link_system-Windows-Dashboard_dashboard",
+            "type": "dashboard",
+            "id": "system-Windows-Dashboard"
+        },
+        {
+            "name": "dadfa90b-35df-4cdb-8b7f-80b75ef8cb9b:link_system-bae11b00-9bfc-11ea-87e4-49f31ec44891_dashboard",
+            "type": "dashboard",
+            "id": "system-bae11b00-9bfc-11ea-87e4-49f31ec44891"
+        },
+        {
+            "name": "dadfa90b-35df-4cdb-8b7f-80b75ef8cb9b:link_system-d401ef40-a7d5-11e9-a422-d144027429da_dashboard",
+            "type": "dashboard",
+            "id": "system-d401ef40-a7d5-11e9-a422-d144027429da"
+        },
+        {
+            "name": "dadfa90b-35df-4cdb-8b7f-80b75ef8cb9b:link_system-71f720f0-ff18-11e9-8405-516218e3d268_dashboard",
+            "type": "dashboard",
+            "id": "system-71f720f0-ff18-11e9-8405-516218e3d268"
+        },
+        {
+            "name": "dadfa90b-35df-4cdb-8b7f-80b75ef8cb9b:link_system-bb858830-f412-11e9-8405-516218e3d268_dashboard",
+            "type": "dashboard",
+            "id": "system-bb858830-f412-11e9-8405-516218e3d268"
         }
     ],
     "managed": false,
diff --git a/packages/system/kibana/dashboard/system-bae11b00-9bfc-11ea-87e4-49f31ec44891.json b/packages/system/kibana/dashboard/system-bae11b00-9bfc-11ea-87e4-49f31ec44891.json
index be38346065b..aa8df27f89a 100644
--- a/packages/system/kibana/dashboard/system-bae11b00-9bfc-11ea-87e4-49f31ec44891.json
+++ b/packages/system/kibana/dashboard/system-bae11b00-9bfc-11ea-87e4-49f31ec44891.json
@@ -544,26 +544,46 @@
             {
                 "embeddableConfig": {
                     "enhancements": {},
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {
-                                "filter": [],
-                                "query": {
-                                    "language": "kuery",
-                                    "query": ""
-                                }
+                    "attributes": {
+                        "title": "links",
+                        "layout": "horizontal",
+                        "links": [
+                            {
+                                "label": "Windows Overview",
+                                "type": "dashboardLink",
+                                "id": "system-Windows-Dashboard",
+                                "order": 0,
+                                "destinationRefName": "link_system-Windows-Dashboard_dashboard"
+                            },
+                            {
+                                "label": "User Logon Information",
+                                "type": "dashboardLink",
+                                "id": "system-bae11b00-9bfc-11ea-87e4-49f31ec44891",
+                                "order": 1,
+                                "destinationRefName": "link_system-bae11b00-9bfc-11ea-87e4-49f31ec44891_dashboard"
+                            },
+                            {
+                                "label": "Logon Failed and Account Lockout",
+                                "type": "dashboardLink",
+                                "id": "system-d401ef40-a7d5-11e9-a422-d144027429da",
+                                "order": 2,
+                                "destinationRefName": "link_system-d401ef40-a7d5-11e9-a422-d144027429da_dashboard"
+                            },
+                            {
+                                "label": "User Management Events",
+                                "type": "dashboardLink",
+                                "id": "system-71f720f0-ff18-11e9-8405-516218e3d268",
+                                "order": 3,
+                                "destinationRefName": "link_system-71f720f0-ff18-11e9-8405-516218e3d268_dashboard"
+                            },
+                            {
+                                "label": "Group Management Events",
+                                "type": "dashboardLink",
+                                "id": "system-bb858830-f412-11e9-8405-516218e3d268",
+                                "order": 4,
+                                "destinationRefName": "link_system-bb858830-f412-11e9-8405-516218e3d268_dashboard"
                             }
-                        },
-                        "description": "",
-                        "params": {
-                            "fontSize": 12,
-                            "markdown": "[Windows Overview](#/dashboard/system-Windows-Dashboard) | **User Logon Information** | [Logon Failed and Account Lockout](#/dashboard/system-d401ef40-a7d5-11e9-a422-d144027429da) | [User Management Events](#/dashboard/system-71f720f0-ff18-11e9-8405-516218e3d268) | [Group Management Events](#/dashboard/system-bb858830-f412-11e9-8405-516218e3d268)",
-                            "openLinksInNewTab": false
-                        },
-                        "title": "Dashboard links  [Windows System Security]",
-                        "type": "markdown",
-                        "uiState": {}
+                        ]
                     }
                 },
                 "gridData": {
@@ -575,7 +595,7 @@
                 },
                 "panelIndex": "34fc9633-8a7c-444d-8d19-06095b55fb43",
                 "title": "",
-                "type": "visualization"
+                "type": "links"
             },
             {
                 "embeddableConfig": {
@@ -1646,6 +1666,31 @@
             "id": "logs-*",
             "name": "28115147-8399-4fcd-95ce-ed0a4f4239e3:kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index",
             "type": "index-pattern"
+        },
+        {
+            "name": "34fc9633-8a7c-444d-8d19-06095b55fb43:link_system-Windows-Dashboard_dashboard",
+            "type": "dashboard",
+            "id": "system-Windows-Dashboard"
+        },
+        {
+            "name": "34fc9633-8a7c-444d-8d19-06095b55fb43:link_system-bae11b00-9bfc-11ea-87e4-49f31ec44891_dashboard",
+            "type": "dashboard",
+            "id": "system-bae11b00-9bfc-11ea-87e4-49f31ec44891"
+        },
+        {
+            "name": "34fc9633-8a7c-444d-8d19-06095b55fb43:link_system-d401ef40-a7d5-11e9-a422-d144027429da_dashboard",
+            "type": "dashboard",
+            "id": "system-d401ef40-a7d5-11e9-a422-d144027429da"
+        },
+        {
+            "name": "34fc9633-8a7c-444d-8d19-06095b55fb43:link_system-71f720f0-ff18-11e9-8405-516218e3d268_dashboard",
+            "type": "dashboard",
+            "id": "system-71f720f0-ff18-11e9-8405-516218e3d268"
+        },
+        {
+            "name": "34fc9633-8a7c-444d-8d19-06095b55fb43:link_system-bb858830-f412-11e9-8405-516218e3d268_dashboard",
+            "type": "dashboard",
+            "id": "system-bb858830-f412-11e9-8405-516218e3d268"
         }
     ],
     "type": "dashboard",
diff --git a/packages/system/kibana/dashboard/system-bb858830-f412-11e9-8405-516218e3d268.json b/packages/system/kibana/dashboard/system-bb858830-f412-11e9-8405-516218e3d268.json
index ecd7c6cbf00..5d0368477f3 100644
--- a/packages/system/kibana/dashboard/system-bb858830-f412-11e9-8405-516218e3d268.json
+++ b/packages/system/kibana/dashboard/system-bb858830-f412-11e9-8405-516218e3d268.json
@@ -1942,26 +1942,46 @@
             {
                 "embeddableConfig": {
                     "enhancements": {},
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {
-                                "filter": [],
-                                "query": {
-                                    "language": "kuery",
-                                    "query": ""
-                                }
+                    "attributes": {
+                        "title": "links",
+                        "layout": "horizontal",
+                        "links": [
+                            {
+                                "label": "Windows Overview",
+                                "type": "dashboardLink",
+                                "id": "system-Windows-Dashboard",
+                                "order": 0,
+                                "destinationRefName": "link_system-Windows-Dashboard_dashboard"
+                            },
+                            {
+                                "label": "User Logon Information",
+                                "type": "dashboardLink",
+                                "id": "system-bae11b00-9bfc-11ea-87e4-49f31ec44891",
+                                "order": 1,
+                                "destinationRefName": "link_system-bae11b00-9bfc-11ea-87e4-49f31ec44891_dashboard"
+                            },
+                            {
+                                "label": "Logon Failed and Account Lockout",
+                                "type": "dashboardLink",
+                                "id": "system-d401ef40-a7d5-11e9-a422-d144027429da",
+                                "order": 2,
+                                "destinationRefName": "link_system-d401ef40-a7d5-11e9-a422-d144027429da_dashboard"
+                            },
+                            {
+                                "label": "User Management Events",
+                                "type": "dashboardLink",
+                                "id": "system-71f720f0-ff18-11e9-8405-516218e3d268",
+                                "order": 3,
+                                "destinationRefName": "link_system-71f720f0-ff18-11e9-8405-516218e3d268_dashboard"
+                            },
+                            {
+                                "label": "Group Management Events",
+                                "type": "dashboardLink",
+                                "id": "system-bb858830-f412-11e9-8405-516218e3d268",
+                                "order": 4,
+                                "destinationRefName": "link_system-bb858830-f412-11e9-8405-516218e3d268_dashboard"
                             }
-                        },
-                        "description": "",
-                        "params": {
-                            "fontSize": 12,
-                            "markdown": "[Windows Overview](#/dashboard/system-Windows-Dashboard) | [User Logon Information](#/dashboard/system-bae11b00-9bfc-11ea-87e4-49f31ec44891) | [Logon Failed and Account Lockout](#/dashboard/system-d401ef40-a7d5-11e9-a422-d144027429da) | [User Management Events](#/dashboard/system-71f720f0-ff18-11e9-8405-516218e3d268) | **Group Management Events**",
-                            "openLinksInNewTab": false
-                        },
-                        "title": "Dashboard links  [Windows System Security]",
-                        "type": "markdown",
-                        "uiState": {}
+                        ]
                     }
                 },
                 "gridData": {
@@ -1973,7 +1993,7 @@
                 },
                 "panelIndex": "663e0493-2070-407b-9d00-079915cce7e7",
                 "title": "",
-                "type": "visualization"
+                "type": "links"
             },
             {
                 "embeddableConfig": {
@@ -4607,6 +4627,31 @@
             "id": "logs-*",
             "name": "e0d495aa-f897-403f-815b-6116fae330b7:a678bf1a-5f5e-4c1a-9999-1952ba858f43",
             "type": "index-pattern"
+        },
+        {
+            "name": "663e0493-2070-407b-9d00-079915cce7e7:link_system-Windows-Dashboard_dashboard",
+            "type": "dashboard",
+            "id": "system-Windows-Dashboard"
+        },
+        {
+            "name": "663e0493-2070-407b-9d00-079915cce7e7:link_system-bae11b00-9bfc-11ea-87e4-49f31ec44891_dashboard",
+            "type": "dashboard",
+            "id": "system-bae11b00-9bfc-11ea-87e4-49f31ec44891"
+        },
+        {
+            "name": "663e0493-2070-407b-9d00-079915cce7e7:link_system-d401ef40-a7d5-11e9-a422-d144027429da_dashboard",
+            "type": "dashboard",
+            "id": "system-d401ef40-a7d5-11e9-a422-d144027429da"
+        },
+        {
+            "name": "663e0493-2070-407b-9d00-079915cce7e7:link_system-71f720f0-ff18-11e9-8405-516218e3d268_dashboard",
+            "type": "dashboard",
+            "id": "system-71f720f0-ff18-11e9-8405-516218e3d268"
+        },
+        {
+            "name": "663e0493-2070-407b-9d00-079915cce7e7:link_system-bb858830-f412-11e9-8405-516218e3d268_dashboard",
+            "type": "dashboard",
+            "id": "system-bb858830-f412-11e9-8405-516218e3d268"
         }
     ],
     "type": "dashboard",
diff --git a/packages/system/kibana/dashboard/system-d401ef40-a7d5-11e9-a422-d144027429da.json b/packages/system/kibana/dashboard/system-d401ef40-a7d5-11e9-a422-d144027429da.json
index 05a5d3a8e11..11aa39c1828 100644
--- a/packages/system/kibana/dashboard/system-d401ef40-a7d5-11e9-a422-d144027429da.json
+++ b/packages/system/kibana/dashboard/system-d401ef40-a7d5-11e9-a422-d144027429da.json
@@ -1351,26 +1351,46 @@
             {
                 "embeddableConfig": {
                     "enhancements": {},
-                    "savedVis": {
-                        "data": {
-                            "aggs": [],
-                            "searchSource": {
-                                "filter": [],
-                                "query": {
-                                    "language": "kuery",
-                                    "query": ""
-                                }
+                    "attributes": {
+                        "title": "links",
+                        "layout": "horizontal",
+                        "links": [
+                            {
+                                "label": "Windows Overview",
+                                "type": "dashboardLink",
+                                "id": "system-Windows-Dashboard",
+                                "order": 0,
+                                "destinationRefName": "link_system-Windows-Dashboard_dashboard"
+                            },
+                            {
+                                "label": "User Logon Information",
+                                "type": "dashboardLink",
+                                "id": "system-bae11b00-9bfc-11ea-87e4-49f31ec44891",
+                                "order": 1,
+                                "destinationRefName": "link_system-bae11b00-9bfc-11ea-87e4-49f31ec44891_dashboard"
+                            },
+                            {
+                                "label": "Logon Failed and Account Lockout",
+                                "type": "dashboardLink",
+                                "id": "system-d401ef40-a7d5-11e9-a422-d144027429da",
+                                "order": 2,
+                                "destinationRefName": "link_system-d401ef40-a7d5-11e9-a422-d144027429da_dashboard"
+                            },
+                            {
+                                "label": "User Management Events",
+                                "type": "dashboardLink",
+                                "id": "system-71f720f0-ff18-11e9-8405-516218e3d268",
+                                "order": 3,
+                                "destinationRefName": "link_system-71f720f0-ff18-11e9-8405-516218e3d268_dashboard"
+                            },
+                            {
+                                "label": "Group Management Events",
+                                "type": "dashboardLink",
+                                "id": "system-bb858830-f412-11e9-8405-516218e3d268",
+                                "order": 4,
+                                "destinationRefName": "link_system-bb858830-f412-11e9-8405-516218e3d268_dashboard"
                             }
-                        },
-                        "description": "",
-                        "params": {
-                            "fontSize": 12,
-                            "markdown": "[Windows Overview](#/dashboard/system-Windows-Dashboard) | [User Logon Information](#/dashboard/system-bae11b00-9bfc-11ea-87e4-49f31ec44891) | **Logon Failed and Account Lockout** | [User Management Events](#/dashboard/system-71f720f0-ff18-11e9-8405-516218e3d268) | [Group Management Events](#/dashboard/system-bb858830-f412-11e9-8405-516218e3d268)",
-                            "openLinksInNewTab": false
-                        },
-                        "title": "Dashboard links  [Windows System Security]",
-                        "type": "markdown",
-                        "uiState": {}
+                        ]
                     }
                 },
                 "gridData": {
@@ -1382,7 +1402,7 @@
                 },
                 "panelIndex": "628de26f-7b7b-457c-b811-e06161e4e7b4",
                 "title": "",
-                "type": "visualization"
+                "type": "links"
             },
             {
                 "embeddableConfig": {
@@ -1919,6 +1939,31 @@
             "id": "logs-*",
             "name": "116833ef-08fd-4c0e-9246-16544157d6ab:kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index",
             "type": "index-pattern"
+        },
+        {
+            "name": "628de26f-7b7b-457c-b811-e06161e4e7b4:link_system-Windows-Dashboard_dashboard",
+            "type": "dashboard",
+            "id": "system-Windows-Dashboard"
+        },
+        {
+            "name": "628de26f-7b7b-457c-b811-e06161e4e7b4:link_system-bae11b00-9bfc-11ea-87e4-49f31ec44891_dashboard",
+            "type": "dashboard",
+            "id": "system-bae11b00-9bfc-11ea-87e4-49f31ec44891"
+        },
+        {
+            "name": "628de26f-7b7b-457c-b811-e06161e4e7b4:link_system-d401ef40-a7d5-11e9-a422-d144027429da_dashboard",
+            "type": "dashboard",
+            "id": "system-d401ef40-a7d5-11e9-a422-d144027429da"
+        },
+        {
+            "name": "628de26f-7b7b-457c-b811-e06161e4e7b4:link_system-71f720f0-ff18-11e9-8405-516218e3d268_dashboard",
+            "type": "dashboard",
+            "id": "system-71f720f0-ff18-11e9-8405-516218e3d268"
+        },
+        {
+            "name": "628de26f-7b7b-457c-b811-e06161e4e7b4:link_system-bb858830-f412-11e9-8405-516218e3d268_dashboard",
+            "type": "dashboard",
+            "id": "system-bb858830-f412-11e9-8405-516218e3d268"
         }
     ],
     "type": "dashboard",
diff --git a/packages/system/manifest.yml b/packages/system/manifest.yml
index 17a871733f6..11f936d09ba 100644
--- a/packages/system/manifest.yml
+++ b/packages/system/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 3.0.2
 name: system
 title: System
-version: "2.3.3"
+version: "2.4.0"
 description: Collect system logs and metrics from your servers with Elastic Agent.
 type: integration
 categories: