diff --git a/database/install/ue_event.sql b/database/install/ue_event.sql
index 2209c14a..9d8962d2 100644
--- a/database/install/ue_event.sql
+++ b/database/install/ue_event.sql
@@ -1,48 +1,20 @@
--- MariaDB dump 10.19  Distrib 10.6.16-MariaDB, for debian-linux-gnu (x86_64)
---
--- Host: 192.168.2.219    Database: omc_db
--- ------------------------------------------------------
--- Server version	10.3.38-MariaDB
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8mb4 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
 --
 -- Table structure for table `ue_event`
 --
 
 DROP TABLE IF EXISTS `ue_event`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `ue_event` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) DEFAULT NULL,
-  `ne_name` varchar(64) DEFAULT NULL,
-  `rm_uid` varchar(32) DEFAULT NULL,
-  `timestamp` int(11) DEFAULT NULL,
-  `event_type` varchar(16) DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
-  `event_json` longtext DEFAULT NULL,
-  `created_at` datetime DEFAULT current_timestamp(),
+CREATE TABLE `ue_event`  (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `ne_type` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `ne_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `rm_uid` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `timestamp` int DEFAULT NULL,
+  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'auth-result/detach/cm-state',
+  `event_json` longtext COLLATE utf8mb4_general_ci,
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`) USING BTREE,
-  KEY `id` (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+  KEY `id` (`id`) USING BTREE,
+  KEY `idx_type_timestamp` (`ne_type`,`timestamp`,`event_type`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 
 -- Dump completed on 2024-03-06 17:26:59
diff --git a/database/install/ue_event_amf.sql b/database/install/ue_event_amf.sql
index a3c09f75..f8bcdf2d 100644
--- a/database/install/ue_event_amf.sql
+++ b/database/install/ue_event_amf.sql
@@ -9,7 +9,7 @@ CREATE TABLE `ue_event_amf` (
   `ne_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL,
   `rm_uid` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
   `timestamp` int DEFAULT NULL,
-  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
+  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'auth-result/detach/cm-state',
   `event_json` longtext COLLATE utf8mb4_general_ci,
   `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`) USING BTREE,
diff --git a/database/install/ue_event_mme.sql b/database/install/ue_event_mme.sql
index 1bf28283..69c4181c 100644
--- a/database/install/ue_event_mme.sql
+++ b/database/install/ue_event_mme.sql
@@ -9,7 +9,7 @@ CREATE TABLE `ue_event_mme` (
   `ne_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL,
   `rm_uid` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
   `timestamp` int DEFAULT NULL,
-  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'ECM STATUS, EMM STATUS',
+  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'auth-result/detach/cm-state',
   `event_json` longtext COLLATE utf8mb4_general_ci,
   `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`) USING BTREE,
diff --git a/database/upgrade/upg_ue_event.sql b/database/upgrade/upg_ue_event.sql
index b60f7382..066fecde 100644
--- a/database/upgrade/upg_ue_event.sql
+++ b/database/upgrade/upg_ue_event.sql
@@ -1,19 +1,3 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : local_mariadb
- Source Server Type    : MariaDB
- Source Server Version : 100338 (10.3.38-MariaDB)
- Source Host           : localhost:33066
- Source Schema         : omc_db
-
- Target Server Type    : MariaDB
- Target Server Version : 100338 (10.3.38-MariaDB)
- File Encoding         : 65001
-
- Date: 22/01/2024 17:03:39
-*/
-
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
@@ -21,16 +5,17 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for ue_event
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `ue_event`  (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `timestamp` int(11) NULL DEFAULT NULL,
-  `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
-  `event_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `created_at` datetime NULL DEFAULT current_timestamp(),
+  `id` int NOT NULL AUTO_INCREMENT,
+  `ne_type` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `ne_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `rm_uid` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `timestamp` int DEFAULT NULL,
+  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'auth-result/detach/cm-state',
+  `event_json` longtext COLLATE utf8mb4_general_ci,
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+  KEY `id` (`id`) USING BTREE,
+  KEY `idx_type_timestamp` (`ne_type`,`timestamp`,`event_type`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/database/upgrade/upg_ue_event_amf.sql b/database/upgrade/upg_ue_event_amf.sql
index 7eebce3e..a9c82a0c 100644
--- a/database/upgrade/upg_ue_event_amf.sql
+++ b/database/upgrade/upg_ue_event_amf.sql
@@ -1,32 +1,17 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : local_mariadb
- Source Server Type    : MariaDB
- Source Server Version : 100338 (10.3.38-MariaDB)
- Source Host           : localhost:33066
- Source Schema         : omc_db
-
- Target Server Type    : MariaDB
- Target Server Version : 100338 (10.3.38-MariaDB)
- File Encoding         : 65001
-
- Date: 22/01/2024 17:03:39
-*/
-
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
 -- ----------------------------
 -- Table structure for ue_event_amf
 -- ----------------------------
+DROP TABLE IF EXISTS `ue_event_amf`;
 CREATE TABLE IF NOT EXISTS `ue_event_amf`  (
   `id` int NOT NULL AUTO_INCREMENT,
   `ne_type` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
   `ne_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL,
   `rm_uid` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
   `timestamp` int DEFAULT NULL,
-  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'auth-result/detach/cm-state',
+  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'auth-result/detach/cm-state',
   `event_json` longtext COLLATE utf8mb4_general_ci,
   `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`) USING BTREE,
diff --git a/database/upgrade/upg_ue_event_mme.sql b/database/upgrade/upg_ue_event_mme.sql
index f9d3b1b2..401c0cc4 100644
--- a/database/upgrade/upg_ue_event_mme.sql
+++ b/database/upgrade/upg_ue_event_mme.sql
@@ -4,13 +4,14 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 -- Table structure for ue_event_mme
 -- ----------------------------
+DROP TABLE IF EXISTS `ue_event_mme`;
 CREATE TABLE IF NOT EXISTS `ue_event_mme`  (
   `id` int NOT NULL AUTO_INCREMENT,
   `ne_type` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
   `ne_name` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL,
   `rm_uid` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL,
   `timestamp` int DEFAULT NULL,
-  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'ECM STATUS, EMM STATUS',
+  `event_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'auth-result/detach/cm-state',
   `event_json` longtext COLLATE utf8mb4_general_ci,
   `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`) USING BTREE,