diff --git a/packages/restapi/tests/lib/benchmark/chat_members.sql b/packages/restapi/tests/lib/benchmark/chat_members.sql
index 530c93371..651d8131a 100644
--- a/packages/restapi/tests/lib/benchmark/chat_members.sql
+++ b/packages/restapi/tests/lib/benchmark/chat_members.sql
@@ -27,16 +27,22 @@ SET time_zone = "+00:00";
 -- Table structure for table `chat_members`
 --
 
-CREATE TABLE `chat_members` (
-  `id` int(11) NOT NULL,
+CREATE TABLE IF NOT EXISTS `chat_members` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `chat_id` varchar(255) NOT NULL,
   `address` varchar(255) NOT NULL,
   `role` varchar(255) NOT NULL,
   `intent` tinyint(1) DEFAULT NULL,
   `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+  `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `chat_address_unique` (`chat_id`,`address`),
+  KEY `chat_id_idx` (`chat_id`),
+  KEY `address_idx` (`address`),
+  KEY `idx_chat_id_intent` (`chat_id`,`intent`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+
 --
 -- Dumping data for table `chat_members`
 --
diff --git a/packages/restapi/tests/lib/benchmark/w2w.sql b/packages/restapi/tests/lib/benchmark/w2w.sql
index 5b2f6831d..b91f906ec 100644
--- a/packages/restapi/tests/lib/benchmark/w2w.sql
+++ b/packages/restapi/tests/lib/benchmark/w2w.sql
@@ -27,7 +27,7 @@ SET time_zone = "+00:00";
 -- Table structure for table `w2w`
 --
 
-CREATE TABLE `w2w` (
+CREATE TABLE IF NOT EXISTS `w2w` (
   `id` int(11) UNSIGNED NOT NULL,
   `combined_did` mediumtext NOT NULL,
   `threadhash` varchar(255) DEFAULT NULL,
diff --git a/packages/restapi/tests/lib/benchmark/w2w_meta.sql b/packages/restapi/tests/lib/benchmark/w2w_meta.sql
index 6df4ffada..8b9c42d62 100644
--- a/packages/restapi/tests/lib/benchmark/w2w_meta.sql
+++ b/packages/restapi/tests/lib/benchmark/w2w_meta.sql
@@ -27,26 +27,28 @@ SET time_zone = "+00:00";
 -- Table structure for table `w2w_meta`
 --
 
-CREATE TABLE `w2w_meta` (
-  `id` int(11) UNSIGNED NOT NULL,
-  `did` varchar(255) NOT NULL,
-  `wallets` longtext,
-  `profile_picture` varchar(512) DEFAULT NULL,
-  `about` varchar(255) DEFAULT NULL,
-  `name` varchar(255) DEFAULT NULL,
-  `pgp_pub` text NOT NULL,
-  `pgp_priv_enc` text NOT NULL,
-  `pgp_enc_type` text NOT NULL,
-  `nft_owner` varchar(255) DEFAULT NULL,
-  `signature` text NOT NULL,
-  `sig_type` text NOT NULL,
-  `linked_list_hash` longtext NOT NULL,
-  `num_msg` int(11) UNSIGNED DEFAULT '0',
-  `allowed_num_msg` int(11) UNSIGNED DEFAULT '0',
-  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `verification_proof` text,
-  `profile` text,
-  `origin` varchar(255) DEFAULT NULL
+CREATE TABLE IF NOT EXISTS w2w_meta (
+  id int(11) unsigned NOT NULL AUTO_INCREMENT,
+  did varchar(255) NOT NULL,
+  wallets longtext,
+  profile_picture varchar(512) DEFAULT NULL,
+  about varchar(255) DEFAULT NULL,
+  name varchar(255) DEFAULT NULL,
+  pgp_pub text NOT NULL,
+  pgp_priv_enc text NOT NULL,
+  pgp_enc_type text NOT NULL,
+  nft_owner varchar(255) DEFAULT NULL,
+  signature text NOT NULL,
+  sig_type text NOT NULL,
+  linked_list_hash longtext NOT NULL,
+  num_msg int(11) unsigned DEFAULT '0',
+  allowed_num_msg int(11) unsigned DEFAULT '0',
+  timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  verification_proof text,
+  profile text,
+  origin varchar(255) DEFAULT NULL,
+  PRIMARY KEY (id),
+  KEY did_idx (did)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --