diff --git a/data/storage/mysql/create_cdrs_tables.sql b/data/storage/mysql/create_cdrs_tables.sql
index 4f93413dc..d2142319f 100644
--- a/data/storage/mysql/create_cdrs_tables.sql
+++ b/data/storage/mysql/create_cdrs_tables.sql
@@ -24,7 +24,10 @@ CREATE TABLE cdrs_primary (
   created_at TIMESTAMP,
   deleted_at TIMESTAMP,
   PRIMARY KEY (id),
-  UNIQUE KEY cgrid (cgrid)
+  UNIQUE KEY cgrid (cgrid),
+  KEY answer_time_idx (answer_time),
+  KEY deleted_at_idx (deleted_at)
+
 );
 
 --
@@ -39,7 +42,8 @@ CREATE TABLE cdrs_extra (
   created_at TIMESTAMP,
   deleted_at TIMESTAMP,
   PRIMARY KEY (id),
-  UNIQUE KEY cgrid (cgrid)
+  UNIQUE KEY cgrid (cgrid),
+  KEY deleted_at_idx (deleted_at)
 );
 
 --
@@ -65,7 +69,8 @@ CREATE TABLE cost_details (
   updated_at TIMESTAMP,
   deleted_at TIMESTAMP,
   PRIMARY KEY (`id`),
-  UNIQUE KEY `costid` (`cgrid`,`runid`)
+  UNIQUE KEY `costid` (`cgrid`,`runid`),
+  KEY deleted_at_idx (deleted_at)
 );
 
 --
@@ -92,5 +97,6 @@ CREATE TABLE `rated_cdrs` (
   updated_at TIMESTAMP,
   deleted_at TIMESTAMP,
   PRIMARY KEY (`id`),
-  UNIQUE KEY `costid` (`cgrid`,`runid`)
+  UNIQUE KEY `costid` (`cgrid`,`runid`),
+  KEY deleted_at_idx (deleted_at)
 );
\ No newline at end of file
diff --git a/data/storage/postgres/create_cdrs_tables.sql b/data/storage/postgres/create_cdrs_tables.sql
index 0f2f22ee3..fd2d9b3fe 100644
--- a/data/storage/postgres/create_cdrs_tables.sql
+++ b/data/storage/postgres/create_cdrs_tables.sql
@@ -25,6 +25,8 @@ CREATE TABLE cdrs_primary (
   deleted_at TIMESTAMP,
   UNIQUE (cgrid)
 );
+CREATE INDEX answer_time_idx ON cdrs_primary (answer_time);
+CREATE INDEX deleted_at_cp_idx ON cdrs_primary (deleted_at);
 
 --
 -- Table structure for table `cdrs_extra`
@@ -39,6 +41,7 @@ CREATE TABLE cdrs_extra (
   deleted_at TIMESTAMP,
   UNIQUE (cgrid)
 );
+CREATE INDEX deleted_at_ce_idx ON cdrs_extra (deleted_at);
 
 --
 -- Table structure for table `cost_details`
@@ -64,6 +67,7 @@ CREATE TABLE cost_details (
   deleted_at TIMESTAMP,
   UNIQUE (cgrid, runid)
 );
+CREATE INDEX deleted_at_cd_idx ON cost_details (deleted_at);
 
 --
 -- Table structure for table `rated_cdrs`
@@ -89,4 +93,5 @@ CREATE TABLE rated_cdrs (
   updated_at TIMESTAMP,
   deleted_at TIMESTAMP,
   UNIQUE (cgrid, runid)
-);
\ No newline at end of file
+);
+CREATE INDEX deleted_at_rc_idx ON rated_cdrs (deleted_at);
\ No newline at end of file