diff --git a/codegen/templates/ethereum/Cargo.lock b/codegen/templates/ethereum/Cargo.lock
index 16f13b2f2..f37c595e1 100644
--- a/codegen/templates/ethereum/Cargo.lock
+++ b/codegen/templates/ethereum/Cargo.lock
@@ -105,9 +105,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4"
+checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
 dependencies = [
  "libc",
 ]
@@ -328,9 +328,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -626,9 +626,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.3.5"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
  "bitflags 1.3.2",
 ]
@@ -680,9 +680,9 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
 
 [[package]]
 name = "rustix"
-version = "0.38.20"
+version = "0.38.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0"
+checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
 dependencies = [
  "bitflags 2.4.1",
  "errno",
@@ -699,18 +699,18 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "serde"
-version = "1.0.189"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
+checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.189"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
+checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -719,9 +719,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
  "itoa",
  "ryu",
@@ -766,9 +766,9 @@ dependencies = [
 
 [[package]]
 name = "substreams-database-change"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb197c21f6b37e87fc275b29c5e330812008b995144f85d0afad36cafc846f1"
+checksum = "3ea09c700498fea3e50eb9aab5b0637d8bfce888be899aa68f987132923e46cc"
 dependencies = [
  "prost",
  "prost-types",
@@ -911,9 +911,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.8.0"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -1090,9 +1090,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "winnow"
-version = "0.5.17"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
+checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32"
 dependencies = [
  "memchr",
 ]
diff --git a/codegen/templates/ethereum/Cargo.toml b/codegen/templates/ethereum/Cargo.toml
index 7ad90ff1b..27fa2e04b 100644
--- a/codegen/templates/ethereum/Cargo.toml
+++ b/codegen/templates/ethereum/Cargo.toml
@@ -16,7 +16,7 @@ prost = "0.11"
 prost-types = "0.11"
 substreams = "0.5"
 substreams-ethereum = "0.9"
-substreams-database-change = "1"
+substreams-database-change = "1.3"
 substreams-entity-change = "1"
 
 # Required so that ethabi > ethereum-types build correctly under wasm32-unknown-unknown
diff --git a/codegen/templates/ethereum/results/lib.rs b/codegen/templates/ethereum/results/lib.rs
index a6f5704ae..ee8c03da0 100644
--- a/codegen/templates/ethereum/results/lib.rs
+++ b/codegen/templates/ethereum/results/lib.rs
@@ -120,9 +120,7 @@ fn db_out(events: contract::Events) -> Result<DatabaseChanges, substreams::error
     // Loop over all the abis events to create changes
     events.approvals.into_iter().for_each(|evt| {
         tables
-            .create_row("approval", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("approval", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("approved", Hex(&evt.approved).to_string())
@@ -131,9 +129,7 @@ fn db_out(events: contract::Events) -> Result<DatabaseChanges, substreams::error
     });
     events.approval_for_alls.into_iter().for_each(|evt| {
         tables
-            .create_row("approval_for_all", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("approval_for_all", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("approved", evt.approved)
@@ -142,9 +138,7 @@ fn db_out(events: contract::Events) -> Result<DatabaseChanges, substreams::error
     });
     events.ownership_transferreds.into_iter().for_each(|evt| {
         tables
-            .create_row("ownership_transferred", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("ownership_transferred", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("new_owner", Hex(&evt.new_owner).to_string())
@@ -152,9 +146,7 @@ fn db_out(events: contract::Events) -> Result<DatabaseChanges, substreams::error
     });
     events.transfers.into_iter().for_each(|evt| {
         tables
-            .create_row("transfer", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("transfer", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("from", Hex(&evt.from).to_string())
diff --git a/codegen/templates/ethereum/results/multiple_contracts/schema.sql b/codegen/templates/ethereum/results/multiple_contracts/schema.sql
index 75ab1cd04..646085ec6 100755
--- a/codegen/templates/ethereum/results/multiple_contracts/schema.sql
+++ b/codegen/templates/ethereum/results/multiple_contracts/schema.sql
@@ -5,7 +5,8 @@ CREATE TABLE IF NOT EXISTS moonbird_approval (
     "evt_block_number" DECIMAL,
     "approved" VARCHAR(40),
     "owner" VARCHAR(40),
-    "token_id" DECIMAL
+    "token_id" DECIMAL,
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS moonbird_approval_for_all (
     "evt_tx_hash" VARCHAR(64),
@@ -14,21 +15,24 @@ CREATE TABLE IF NOT EXISTS moonbird_approval_for_all (
     "evt_block_number" DECIMAL,
     "approved" BOOL,
     "operator" VARCHAR(40),
-    "owner" VARCHAR(40)
+    "owner" VARCHAR(40),
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS moonbird_expelled (
     "evt_tx_hash" VARCHAR(64),
     "evt_index" INT,
     "evt_block_time" TIMESTAMP,
     "evt_block_number" DECIMAL,
-    "token_id" DECIMAL
+    "token_id" DECIMAL,
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS moonbird_nested (
     "evt_tx_hash" VARCHAR(64),
     "evt_index" INT,
     "evt_block_time" TIMESTAMP,
     "evt_block_number" DECIMAL,
-    "token_id" DECIMAL
+    "token_id" DECIMAL,
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS moonbird_ownership_transferred (
     "evt_tx_hash" VARCHAR(64),
@@ -36,14 +40,16 @@ CREATE TABLE IF NOT EXISTS moonbird_ownership_transferred (
     "evt_block_time" TIMESTAMP,
     "evt_block_number" DECIMAL,
     "new_owner" VARCHAR(40),
-    "previous_owner" VARCHAR(40)
+    "previous_owner" VARCHAR(40),
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS moonbird_paused (
     "evt_tx_hash" VARCHAR(64),
     "evt_index" INT,
     "evt_block_time" TIMESTAMP,
     "evt_block_number" DECIMAL,
-    "account" VARCHAR(40)
+    "account" VARCHAR(40),
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS moonbird_refund (
     "evt_tx_hash" VARCHAR(64),
@@ -51,7 +57,8 @@ CREATE TABLE IF NOT EXISTS moonbird_refund (
     "evt_block_time" TIMESTAMP,
     "evt_block_number" DECIMAL,
     "amount" DECIMAL,
-    "buyer" VARCHAR(40)
+    "buyer" VARCHAR(40),
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS moonbird_revenue (
     "evt_tx_hash" VARCHAR(64),
@@ -60,7 +67,8 @@ CREATE TABLE IF NOT EXISTS moonbird_revenue (
     "evt_block_number" DECIMAL,
     "amount" DECIMAL,
     "beneficiary" VARCHAR(40),
-    "num_purchased" DECIMAL
+    "num_purchased" DECIMAL,
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS moonbird_role_admin_changed (
     "evt_tx_hash" VARCHAR(64),
@@ -69,7 +77,8 @@ CREATE TABLE IF NOT EXISTS moonbird_role_admin_changed (
     "evt_block_number" DECIMAL,
     "new_admin_role" TEXT,
     "previous_admin_role" TEXT,
-    "role" TEXT
+    "role" TEXT,
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS moonbird_role_granted (
     "evt_tx_hash" VARCHAR(64),
@@ -78,7 +87,8 @@ CREATE TABLE IF NOT EXISTS moonbird_role_granted (
     "evt_block_number" DECIMAL,
     "account" VARCHAR(40),
     "role" TEXT,
-    "sender" VARCHAR(40)
+    "sender" VARCHAR(40),
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS moonbird_role_revoked (
     "evt_tx_hash" VARCHAR(64),
@@ -87,7 +97,8 @@ CREATE TABLE IF NOT EXISTS moonbird_role_revoked (
     "evt_block_number" DECIMAL,
     "account" VARCHAR(40),
     "role" TEXT,
-    "sender" VARCHAR(40)
+    "sender" VARCHAR(40),
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS moonbird_transfer (
     "evt_tx_hash" VARCHAR(64),
@@ -96,21 +107,24 @@ CREATE TABLE IF NOT EXISTS moonbird_transfer (
     "evt_block_number" DECIMAL,
     "from" VARCHAR(40),
     "to" VARCHAR(40),
-    "token_id" DECIMAL
+    "token_id" DECIMAL,
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS moonbird_unnested (
     "evt_tx_hash" VARCHAR(64),
     "evt_index" INT,
     "evt_block_time" TIMESTAMP,
     "evt_block_number" DECIMAL,
-    "token_id" DECIMAL
+    "token_id" DECIMAL,
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS moonbird_unpaused (
     "evt_tx_hash" VARCHAR(64),
     "evt_index" INT,
     "evt_block_time" TIMESTAMP,
     "evt_block_number" DECIMAL,
-    "account" VARCHAR(40)
+    "account" VARCHAR(40),
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS bayc_approval (
     "evt_tx_hash" VARCHAR(64),
@@ -119,7 +133,8 @@ CREATE TABLE IF NOT EXISTS bayc_approval (
     "evt_block_number" DECIMAL,
     "approved" VARCHAR(40),
     "owner" VARCHAR(40),
-    "token_id" DECIMAL
+    "token_id" DECIMAL,
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS bayc_approval_for_all (
     "evt_tx_hash" VARCHAR(64),
@@ -128,7 +143,8 @@ CREATE TABLE IF NOT EXISTS bayc_approval_for_all (
     "evt_block_number" DECIMAL,
     "approved" BOOL,
     "operator" VARCHAR(40),
-    "owner" VARCHAR(40)
+    "owner" VARCHAR(40),
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS bayc_ownership_transferred (
     "evt_tx_hash" VARCHAR(64),
@@ -136,7 +152,8 @@ CREATE TABLE IF NOT EXISTS bayc_ownership_transferred (
     "evt_block_time" TIMESTAMP,
     "evt_block_number" DECIMAL,
     "new_owner" VARCHAR(40),
-    "previous_owner" VARCHAR(40)
+    "previous_owner" VARCHAR(40),
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS bayc_transfer (
     "evt_tx_hash" VARCHAR(64),
@@ -145,5 +162,7 @@ CREATE TABLE IF NOT EXISTS bayc_transfer (
     "evt_block_number" DECIMAL,
     "from" VARCHAR(40),
     "to" VARCHAR(40),
-    "token_id" DECIMAL
+    "token_id" DECIMAL,
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
+
diff --git a/codegen/templates/ethereum/results/multiple_contracts/src/lib.rs b/codegen/templates/ethereum/results/multiple_contracts/src/lib.rs
index 4fd67e1ba..74b2f4581 100644
--- a/codegen/templates/ethereum/results/multiple_contracts/src/lib.rs
+++ b/codegen/templates/ethereum/results/multiple_contracts/src/lib.rs
@@ -413,9 +413,7 @@ fn db_moonbird_out(events: &contract::Events, tables: &mut DatabaseChangeTables)
     // Loop over all the abis events to create table changes
     events.moonbird_approvals.iter().for_each(|evt| {
         tables
-            .create_row("moonbird_approval", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("moonbird_approval", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("approved", Hex(&evt.approved).to_string())
@@ -424,9 +422,7 @@ fn db_moonbird_out(events: &contract::Events, tables: &mut DatabaseChangeTables)
     });
     events.moonbird_approval_for_alls.iter().for_each(|evt| {
         tables
-            .create_row("moonbird_approval_for_all", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("moonbird_approval_for_all", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("approved", evt.approved)
@@ -435,27 +431,21 @@ fn db_moonbird_out(events: &contract::Events, tables: &mut DatabaseChangeTables)
     });
     events.moonbird_expelleds.iter().for_each(|evt| {
         tables
-            .create_row("moonbird_expelled", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("moonbird_expelled", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("token_id", BigDecimal::from_str(&evt.token_id).unwrap());
     });
     events.moonbird_nesteds.iter().for_each(|evt| {
         tables
-            .create_row("moonbird_nested", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("moonbird_nested", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("token_id", BigDecimal::from_str(&evt.token_id).unwrap());
     });
     events.moonbird_ownership_transferreds.iter().for_each(|evt| {
         tables
-            .create_row("moonbird_ownership_transferred", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("moonbird_ownership_transferred", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("new_owner", Hex(&evt.new_owner).to_string())
@@ -463,18 +453,14 @@ fn db_moonbird_out(events: &contract::Events, tables: &mut DatabaseChangeTables)
     });
     events.moonbird_pauseds.iter().for_each(|evt| {
         tables
-            .create_row("moonbird_paused", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("moonbird_paused", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("account", Hex(&evt.account).to_string());
     });
     events.moonbird_refunds.iter().for_each(|evt| {
         tables
-            .create_row("moonbird_refund", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("moonbird_refund", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("amount", BigDecimal::from_str(&evt.amount).unwrap())
@@ -482,9 +468,7 @@ fn db_moonbird_out(events: &contract::Events, tables: &mut DatabaseChangeTables)
     });
     events.moonbird_revenues.iter().for_each(|evt| {
         tables
-            .create_row("moonbird_revenue", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("moonbird_revenue", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("amount", BigDecimal::from_str(&evt.amount).unwrap())
@@ -493,9 +477,7 @@ fn db_moonbird_out(events: &contract::Events, tables: &mut DatabaseChangeTables)
     });
     events.moonbird_role_admin_changeds.iter().for_each(|evt| {
         tables
-            .create_row("moonbird_role_admin_changed", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("moonbird_role_admin_changed", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("new_admin_role", Hex(&evt.new_admin_role).to_string())
@@ -504,9 +486,7 @@ fn db_moonbird_out(events: &contract::Events, tables: &mut DatabaseChangeTables)
     });
     events.moonbird_role_granteds.iter().for_each(|evt| {
         tables
-            .create_row("moonbird_role_granted", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("moonbird_role_granted", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("account", Hex(&evt.account).to_string())
@@ -515,9 +495,7 @@ fn db_moonbird_out(events: &contract::Events, tables: &mut DatabaseChangeTables)
     });
     events.moonbird_role_revokeds.iter().for_each(|evt| {
         tables
-            .create_row("moonbird_role_revoked", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("moonbird_role_revoked", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("account", Hex(&evt.account).to_string())
@@ -526,9 +504,7 @@ fn db_moonbird_out(events: &contract::Events, tables: &mut DatabaseChangeTables)
     });
     events.moonbird_transfers.iter().for_each(|evt| {
         tables
-            .create_row("moonbird_transfer", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("moonbird_transfer", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("from", Hex(&evt.from).to_string())
@@ -537,18 +513,14 @@ fn db_moonbird_out(events: &contract::Events, tables: &mut DatabaseChangeTables)
     });
     events.moonbird_unnesteds.iter().for_each(|evt| {
         tables
-            .create_row("moonbird_unnested", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("moonbird_unnested", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("token_id", BigDecimal::from_str(&evt.token_id).unwrap());
     });
     events.moonbird_unpauseds.iter().for_each(|evt| {
         tables
-            .create_row("moonbird_unpaused", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("moonbird_unpaused", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("account", Hex(&evt.account).to_string());
@@ -558,9 +530,7 @@ fn db_bayc_out(events: &contract::Events, tables: &mut DatabaseChangeTables) {
     // Loop over all the abis events to create table changes
     events.bayc_approvals.iter().for_each(|evt| {
         tables
-            .create_row("bayc_approval", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("bayc_approval", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("approved", Hex(&evt.approved).to_string())
@@ -569,9 +539,7 @@ fn db_bayc_out(events: &contract::Events, tables: &mut DatabaseChangeTables) {
     });
     events.bayc_approval_for_alls.iter().for_each(|evt| {
         tables
-            .create_row("bayc_approval_for_all", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("bayc_approval_for_all", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("approved", evt.approved)
@@ -580,9 +548,7 @@ fn db_bayc_out(events: &contract::Events, tables: &mut DatabaseChangeTables) {
     });
     events.bayc_ownership_transferreds.iter().for_each(|evt| {
         tables
-            .create_row("bayc_ownership_transferred", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("bayc_ownership_transferred", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("new_owner", Hex(&evt.new_owner).to_string())
@@ -590,9 +556,7 @@ fn db_bayc_out(events: &contract::Events, tables: &mut DatabaseChangeTables) {
     });
     events.bayc_transfers.iter().for_each(|evt| {
         tables
-            .create_row("bayc_transfer", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("bayc_transfer", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("from", Hex(&evt.from).to_string())
diff --git a/codegen/templates/ethereum/schema.sql b/codegen/templates/ethereum/schema.sql
index 2f852f099..b1f6b5863 100644
--- a/codegen/templates/ethereum/schema.sql
+++ b/codegen/templates/ethereum/schema.sql
@@ -5,7 +5,8 @@ CREATE TABLE IF NOT EXISTS approval (
     "evt_block_number" DECIMAL,
     "approved" VARCHAR(40),
     "owner" VARCHAR(40),
-    "token_id" DECIMAL
+    "token_id" DECIMAL,
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS approval_for_all (
     "evt_tx_hash" VARCHAR(64),
@@ -14,7 +15,8 @@ CREATE TABLE IF NOT EXISTS approval_for_all (
     "evt_block_number" DECIMAL,
     "approved" BOOL,
     "operator" VARCHAR(40),
-    "owner" VARCHAR(40)
+    "owner" VARCHAR(40),
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS ownership_transferred (
     "evt_tx_hash" VARCHAR(64),
@@ -22,7 +24,8 @@ CREATE TABLE IF NOT EXISTS ownership_transferred (
     "evt_block_time" TIMESTAMP,
     "evt_block_number" DECIMAL,
     "new_owner" VARCHAR(40),
-    "previous_owner" VARCHAR(40)
+    "previous_owner" VARCHAR(40),
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 CREATE TABLE IF NOT EXISTS transfer (
     "evt_tx_hash" VARCHAR(64),
@@ -31,5 +34,7 @@ CREATE TABLE IF NOT EXISTS transfer (
     "evt_block_number" DECIMAL,
     "from" VARCHAR(40),
     "to" VARCHAR(40),
-    "token_id" DECIMAL
+    "token_id" DECIMAL,
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
+
diff --git a/codegen/templates/ethereum/schema.sql.gotmpl b/codegen/templates/ethereum/schema.sql.gotmpl
index 9c61e20b6..381055e6f 100644
--- a/codegen/templates/ethereum/schema.sql.gotmpl
+++ b/codegen/templates/ethereum/schema.sql.gotmpl
@@ -7,11 +7,12 @@ CREATE TABLE IF NOT EXISTS {{ if ne $numberOfContracts 1 }}{{ $contract.GetName
     "evt_tx_hash" VARCHAR(64),
     "evt_index" INT,
     "evt_block_time" TIMESTAMP,
-    "evt_block_number" DECIMAL{{ if ne $numberOfAttributes 0 }},{{ end -}}
+    "evt_block_number" DECIMAL,
     {{- $i := 0 }}
     {{- range $fieldName, $sqlType := $rust.ProtoFieldSqlmap }}
-    {{ $i = add $i 1 }}{{ $fieldName }} {{ $sqlType }}{{ if eq $i $numberOfAttributes }}{{ else }},{{ end }}
+    {{ $i = add $i 1 }}{{ $fieldName }} {{ $sqlType }},
     {{- end}}
+    PRIMARY KEY(evt_tx_hash,evt_index)
 );
 {{ end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/codegen/templates/ethereum/src/lib.rs b/codegen/templates/ethereum/src/lib.rs
index a6f5704ae..ee8c03da0 100755
--- a/codegen/templates/ethereum/src/lib.rs
+++ b/codegen/templates/ethereum/src/lib.rs
@@ -120,9 +120,7 @@ fn db_out(events: contract::Events) -> Result<DatabaseChanges, substreams::error
     // Loop over all the abis events to create changes
     events.approvals.into_iter().for_each(|evt| {
         tables
-            .create_row("approval", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("approval", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("approved", Hex(&evt.approved).to_string())
@@ -131,9 +129,7 @@ fn db_out(events: contract::Events) -> Result<DatabaseChanges, substreams::error
     });
     events.approval_for_alls.into_iter().for_each(|evt| {
         tables
-            .create_row("approval_for_all", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("approval_for_all", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("approved", evt.approved)
@@ -142,9 +138,7 @@ fn db_out(events: contract::Events) -> Result<DatabaseChanges, substreams::error
     });
     events.ownership_transferreds.into_iter().for_each(|evt| {
         tables
-            .create_row("ownership_transferred", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("ownership_transferred", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("new_owner", Hex(&evt.new_owner).to_string())
@@ -152,9 +146,7 @@ fn db_out(events: contract::Events) -> Result<DatabaseChanges, substreams::error
     });
     events.transfers.into_iter().for_each(|evt| {
         tables
-            .create_row("transfer", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("transfer", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.unwrap())
             .set("evt_block_number", evt.evt_block_number)
             .set("from", Hex(&evt.from).to_string())
diff --git a/codegen/templates/ethereum/src/lib.rs.gotmpl b/codegen/templates/ethereum/src/lib.rs.gotmpl
index ae42ad70e..0872ab6b2 100644
--- a/codegen/templates/ethereum/src/lib.rs.gotmpl
+++ b/codegen/templates/ethereum/src/lib.rs.gotmpl
@@ -60,9 +60,7 @@ fn db_out(events: contract::Events) -> Result<DatabaseChanges, substreams::error
     {{- $rust := $event.Rust }}
     events.{{ $rust.ProtoOutputModuleFieldName }}.into_iter().for_each(|evt| {
         tables
-            .create_row("{{ $rust.TableChangeEntityName }}", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("{{ $rust.TableChangeEntityName }}", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.unwrap())
             .set("evt_block_number", evt.evt_block_number)
             {{- $numberOfAttributes := len $rust.ProtoFieldTableChangesMap }}{{ if eq $numberOfAttributes 0 }};{{ end }}
diff --git a/codegen/templates/ethereum/src/multiple_contracts_lib.rs.gotmpl b/codegen/templates/ethereum/src/multiple_contracts_lib.rs.gotmpl
index c9b45ec39..32762885d 100644
--- a/codegen/templates/ethereum/src/multiple_contracts_lib.rs.gotmpl
+++ b/codegen/templates/ethereum/src/multiple_contracts_lib.rs.gotmpl
@@ -59,9 +59,7 @@ fn db_{{ $contract.GetName }}_out(events: &contract::Events, tables: &mut Databa
     {{- $rust := $event.Rust }}
     events.{{ $contract.GetName }}_{{ $rust.ProtoOutputModuleFieldName }}.iter().for_each(|evt| {
         tables
-            .create_row("{{ if eq $numberOfContracts 1 }}{{ $rust.TableChangeEntityName }}{{ else }}{{ $contract.GetName }}_{{ $rust.TableChangeEntityName }}{{ end }}", format!("{}-{}", evt.evt_tx_hash, evt.evt_index))
-            .set("evt_tx_hash", &evt.evt_tx_hash)
-            .set("evt_index", evt.evt_index)
+            .create_row("{{ if eq $numberOfContracts 1 }}{{ $rust.TableChangeEntityName }}{{ else }}{{ $contract.GetName }}_{{ $rust.TableChangeEntityName }}{{ end }}", [("evt_tx_hash", evt.evt_tx_hash),("evt_index", evt.evt_index.to_string())])
             .set("evt_block_time", evt.evt_block_time.as_ref().unwrap())
             .set("evt_block_number", evt.evt_block_number)
             {{- $numberOfAttributes := len $rust.ProtoFieldTableChangesMap }}{{ if eq $numberOfAttributes 0 }};{{ end }}
diff --git a/docs/release-notes/change-log.md b/docs/release-notes/change-log.md
index c3e9a99d5..1544a20cc 100644
--- a/docs/release-notes/change-log.md
+++ b/docs/release-notes/change-log.md
@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
+### Changed
+* Codegen: substreams-database-change to v1.3, properly generates primary key to support chain reorgs in postgres sink.
+
 ### Fixed
 * Fix `substreams info` cli doc field which wasn't printing any doc output