diff --git a/database/install/cdr_event_ims.sql b/database/install/cdr_event_ims.sql
index 86a4e9fa..f708f171 100644
--- a/database/install/cdr_event_ims.sql
+++ b/database/install/cdr_event_ims.sql
@@ -21,16 +21,17 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for cdr_event_ims
 -- ----------------------------
 DROP TABLE IF EXISTS `cdr_event_ims`;
-CREATE TABLE `cdr_event_ims`  (
-  `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,
-  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `created_at` datetime NULL DEFAULT current_timestamp(),
+CREATE TABLE `cdr_event_ims` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `timestamp` int DEFAULT NULL,
+  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+  KEY `id` (`id`) USING BTREE,
+  KEY `idx_type_timestamp` (`ne_type`,`timestamp`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/database/install/cdr_event_smf.sql b/database/install/cdr_event_smf.sql
index ac16df2a..e0d6a0fb 100644
--- a/database/install/cdr_event_smf.sql
+++ b/database/install/cdr_event_smf.sql
@@ -21,16 +21,17 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for cdr_event_smf
 -- ----------------------------
 DROP TABLE IF EXISTS `cdr_event_smf`;
-CREATE TABLE `cdr_event_smf`  (
-  `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,
-  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `created_at` datetime NULL DEFAULT current_timestamp(),
+CREATE TABLE `cdr_event_smf` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `timestamp` int DEFAULT NULL,
+  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+  KEY `id` (`id`) USING BTREE,
+  KEY `idx_type_timestamp` (`ne_type`,`timestamp`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/database/upgrade/upg_cdr_event_ims.sql b/database/upgrade/upg_cdr_event_ims.sql
index dc6935b2..236d0cc4 100644
--- a/database/upgrade/upg_cdr_event_ims.sql
+++ b/database/upgrade/upg_cdr_event_ims.sql
@@ -21,15 +21,18 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for cdr_event_ims
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `cdr_event_ims`  (
-  `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,
-  `cdr_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) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `timestamp` int DEFAULT NULL,
+  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+  KEY `id` (`id`) USING BTREE,
+  KEY `idx_type_timestamp` (`ne_type`,`timestamp`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+ALTER TABLE `cdr_event_ims` ADD INDEX IF NOT EXISTS `idx_type_timestamp`(`ne_type`, `timestamp`) USING BTREE;
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/database/upgrade/upg_cdr_event_smf.sql b/database/upgrade/upg_cdr_event_smf.sql
index d9da4a13..c4b6870a 100644
--- a/database/upgrade/upg_cdr_event_smf.sql
+++ b/database/upgrade/upg_cdr_event_smf.sql
@@ -21,15 +21,18 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for cdr_event_smf
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `cdr_event_smf`  (
-  `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,
-  `cdr_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) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `timestamp` int DEFAULT NULL,
+  `cdr_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `id`(`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+  KEY `id` (`id`) USING BTREE,
+  KEY `idx_type_timestamp` (`ne_type`,`timestamp`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+ALTER TABLE `cdr_event_smf` ADD INDEX IF NOT EXISTS `idx_type_timestamp`(`ne_type`, `timestamp`) USING BTREE;
 
 SET FOREIGN_KEY_CHECKS = 1;