diff --git a/src/database.rs b/src/database.rs
index e09af8f..e8a2cb0 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -699,7 +699,7 @@ impl Database {
 
         query(
             format!(
-                "CREATE INDEX x_source_transfer ON {}.tx_transfer USING HASH (source);",
+                "ALTER TABLE {0}.tx_transfer ADD CONSTRAINT fk_tx_id FOREIGN KEY (tx_id) REFERENCES {0}.transactions (hash);",
                 self.network
             )
             .as_str(),
@@ -709,7 +709,17 @@ impl Database {
 
         query(
             format!(
-                "CREATE INDEX x_target_transfer ON {}.tx_transfer USING HASH (target);",
+                "CREATE INDEX x_source_transfer ON {}.tx_transfer (source);",
+                self.network
+            )
+            .as_str(),
+        )
+        .execute(&*self.pool)
+        .await?;
+
+        query(
+            format!(
+                "CREATE INDEX x_target_transfer ON {}.tx_transfer (target);",
                 self.network
             )
             .as_str(),
@@ -727,6 +737,16 @@ impl Database {
         .execute(&*self.pool)
         .await?;
 
+        query(
+            format!(
+                "ALTER TABLE {0}.tx_bond ADD CONSTRAINT fk_tx_id FOREIGN KEY (tx_id) REFERENCES {0}.transactions (hash);",
+                self.network
+            )
+            .as_str(),
+        )
+        .execute(&*self.pool)
+        .await?;
+
         query(
             format!(
                 "ALTER TABLE {}.tx_bridge_pool ADD CONSTRAINT pk_tx_id_bridge PRIMARY KEY (tx_id);",
@@ -739,7 +759,17 @@ impl Database {
 
         query(
             format!(
-                "CREATE INDEX x_validator_bond ON {}.tx_bond USING HASH (validator);",
+                "ALTER TABLE {0}.tx_bridge_pool ADD CONSTRAINT fk_tx_id FOREIGN KEY (tx_id) REFERENCES {0}.transactions (hash);",
+                self.network
+            )
+            .as_str(),
+        )
+        .execute(&*self.pool)
+        .await?;
+
+        query(
+            format!(
+                "CREATE INDEX x_validator_bond ON {}.tx_bond (validator);",
                 self.network
             )
             .as_str(),
@@ -749,7 +779,7 @@ impl Database {
 
         query(
             format!(
-                "CREATE INDEX x_source_bond ON {}.tx_bond USING HASH (source);",
+                "CREATE INDEX x_source_bond ON {}.tx_bond (source);",
                 self.network
             )
             .as_str(),