diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08a93c055c..d68424a6da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 ### Changed
 
-- Removed embedded discover [#6120](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6120) [#6235](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6235) [#6254](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6254) [#6285](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6285) [#6288](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6288) [#6290](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6290) [#6289](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6289) [#6286](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6286) [#6275](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6275) [#6287](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6287)
+- Removed embedded discover [#6120](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6120) [#6235](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6235) [#6254](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6254) [#6285](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6285) [#6288](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6288) [#6290](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6290) [#6289](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6289) [#6286](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6286) [#6275](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6275) [#6287](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6287) [#6297](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6297) [#6287](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6287) [#6291](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6287)
 - Develop logic of a new index for the fim module [#6227](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6227)
 - Allow editing groups for an agent from Endpoints Summary [#6250](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6250)
 
diff --git a/plugins/main/public/components/common/modules/modules-defaults.js b/plugins/main/public/components/common/modules/modules-defaults.js
index 536a00df6d..5e4e824109 100644
--- a/plugins/main/public/components/common/modules/modules-defaults.js
+++ b/plugins/main/public/components/common/modules/modules-defaults.js
@@ -33,6 +33,12 @@ import { amazonWebServicesColumns } from '../../overview/amazon-web-services/eve
 import { office365Columns } from '../../overview/office-panel/events/office-365-columns';
 import { fileIntegrityMonitoringColumns } from '../../overview/fim/events/file-integrity-monitoring-columns';
 import { configurationAssessmentColumns } from '../../agents/sca/events/configuration-assessment-columns';
+import { pciColumns } from '../../overview/pci/events/pci-columns';
+import { hipaaColumns } from '../../overview/hipaa/events/hipaa-columns';
+import { nistColumns } from '../../overview/nist/events/nist-columns';
+import { gdprColumns } from '../../overview/gdpr/events/gdpr-columns';
+import { tscColumns } from '../../overview/tsc/events/tsc-columns';
+import { githubColumns } from '../../overview/github-panel/events/github-columns';
 
 const DashboardTab = {
   id: 'dashboard',
@@ -61,7 +67,7 @@ const EventsTab = {
   component: Events,
 };
 
-const RegulatoryComplianceTabs = [
+const RegulatoryComplianceTabs = columns => [
   DashboardTab,
   {
     id: 'inventory',
@@ -69,7 +75,7 @@ const RegulatoryComplianceTabs = [
     buttons: [ButtonModuleExploreAgent],
     component: ComplianceTable,
   },
-  EventsTab,
+  renderDiscoverTab(DEFAULT_INDEX_PATTERN, columns),
 ];
 
 export const ModulesDefaults = {
@@ -183,7 +189,7 @@ export const ModulesDefaults = {
         buttons: [ButtonModuleExploreAgent],
         component: GitHubPanel,
       },
-      EventsTab,
+      renderDiscoverTab(DEFAULT_INDEX_PATTERN, githubColumns),
     ],
     availableFor: ['manager', 'agent'],
   },
@@ -265,27 +271,27 @@ export const ModulesDefaults = {
   },
   pci: {
     init: 'dashboard',
-    tabs: RegulatoryComplianceTabs,
+    tabs: RegulatoryComplianceTabs(pciColumns),
     availableFor: ['manager', 'agent'],
   },
   hipaa: {
     init: 'dashboard',
-    tabs: RegulatoryComplianceTabs,
+    tabs: RegulatoryComplianceTabs(hipaaColumns),
     availableFor: ['manager', 'agent'],
   },
   nist: {
     init: 'dashboard',
-    tabs: RegulatoryComplianceTabs,
+    tabs: RegulatoryComplianceTabs(nistColumns),
     availableFor: ['manager', 'agent'],
   },
   gdpr: {
     init: 'dashboard',
-    tabs: RegulatoryComplianceTabs,
+    tabs: RegulatoryComplianceTabs(gdprColumns),
     availableFor: ['manager', 'agent'],
   },
   tsc: {
     init: 'dashboard',
-    tabs: RegulatoryComplianceTabs,
+    tabs: RegulatoryComplianceTabs(tscColumns),
     availableFor: ['manager', 'agent'],
   },
   syscollector: {
diff --git a/plugins/main/public/components/overview/gdpr/events/gdpr-columns.tsx b/plugins/main/public/components/overview/gdpr/events/gdpr-columns.tsx
new file mode 100644
index 0000000000..f02c3d9464
--- /dev/null
+++ b/plugins/main/public/components/overview/gdpr/events/gdpr-columns.tsx
@@ -0,0 +1,19 @@
+import { tDataGridColumn } from '../../../common/data-grid';
+
+export const gdprColumns: tDataGridColumn[] = [
+  {
+    id: 'agent.name',
+  },
+  {
+    id: 'rule.gdpr',
+  },
+  {
+    id: 'rule.description',
+  },
+  {
+    id: 'rule.level',
+  },
+  {
+    id: 'rule.id',
+  },
+];
diff --git a/plugins/main/public/components/overview/github-panel/events/github-columns.tsx b/plugins/main/public/components/overview/github-panel/events/github-columns.tsx
new file mode 100644
index 0000000000..28e0db7a4f
--- /dev/null
+++ b/plugins/main/public/components/overview/github-panel/events/github-columns.tsx
@@ -0,0 +1,25 @@
+import { tDataGridColumn } from '../../../common/data-grid';
+
+export const githubColumns: tDataGridColumn[] = [
+  {
+    id: 'agent.id',
+  },
+  {
+    id: 'data.github.repo',
+  },
+  {
+    id: 'data.github.actor',
+  },
+  {
+    id: 'data.github.org',
+  },
+  {
+    id: 'rule.description',
+  },
+  {
+    id: 'rule.level',
+  },
+  {
+    id: 'rule.id',
+  },
+];
diff --git a/plugins/main/public/components/overview/hipaa/events/hipaa-columns.tsx b/plugins/main/public/components/overview/hipaa/events/hipaa-columns.tsx
new file mode 100644
index 0000000000..9a31860eec
--- /dev/null
+++ b/plugins/main/public/components/overview/hipaa/events/hipaa-columns.tsx
@@ -0,0 +1,19 @@
+import { tDataGridColumn } from '../../../common/data-grid';
+
+export const hipaaColumns: tDataGridColumn[] = [
+  {
+    id: 'agent.name',
+  },
+  {
+    id: 'rule.hipaa',
+  },
+  {
+    id: 'rule.description',
+  },
+  {
+    id: 'rule.level',
+  },
+  {
+    id: 'rule.id',
+  },
+];
diff --git a/plugins/main/public/components/overview/nist/events/nist-columns.tsx b/plugins/main/public/components/overview/nist/events/nist-columns.tsx
new file mode 100644
index 0000000000..55ca628416
--- /dev/null
+++ b/plugins/main/public/components/overview/nist/events/nist-columns.tsx
@@ -0,0 +1,19 @@
+import { tDataGridColumn } from '../../../common/data-grid';
+
+export const nistColumns: tDataGridColumn[] = [
+  {
+    id: 'agent.name',
+  },
+  {
+    id: 'rule.nist_800_53',
+  },
+  {
+    id: 'rule.description',
+  },
+  {
+    id: 'rule.level',
+  },
+  {
+    id: 'rule.id',
+  },
+];
diff --git a/plugins/main/public/components/overview/pci/events/pci-columns.tsx b/plugins/main/public/components/overview/pci/events/pci-columns.tsx
new file mode 100644
index 0000000000..374705cefe
--- /dev/null
+++ b/plugins/main/public/components/overview/pci/events/pci-columns.tsx
@@ -0,0 +1,19 @@
+import { tDataGridColumn } from '../../../common/data-grid';
+
+export const pciColumns: tDataGridColumn[] = [
+  {
+    id: 'agent.name',
+  },
+  {
+    id: 'rule.pci_dss',
+  },
+  {
+    id: 'rule.description',
+  },
+  {
+    id: 'rule.level',
+  },
+  {
+    id: 'rule.id',
+  },
+];
diff --git a/plugins/main/public/components/overview/tsc/events/tsc-columns.tsx b/plugins/main/public/components/overview/tsc/events/tsc-columns.tsx
new file mode 100644
index 0000000000..d67fb46b41
--- /dev/null
+++ b/plugins/main/public/components/overview/tsc/events/tsc-columns.tsx
@@ -0,0 +1,19 @@
+import { tDataGridColumn } from '../../../common/data-grid';
+
+export const tscColumns: tDataGridColumn[] = [
+  {
+    id: 'agent.name',
+  },
+  {
+    id: 'rule.tsc',
+  },
+  {
+    id: 'rule.description',
+  },
+  {
+    id: 'rule.level',
+  },
+  {
+    id: 'rule.id',
+  },
+];