diff --git a/substreams/Cargo.lock b/substreams/Cargo.lock
index b7055cb..3132472 100644
--- a/substreams/Cargo.lock
+++ b/substreams/Cargo.lock
@@ -991,7 +991,7 @@ dependencies = [
 
 [[package]]
 name = "substreams-ethereum-ambient"
-version = "0.5.0"
+version = "0.5.1"
 dependencies = [
  "anyhow",
  "bytes",
@@ -1041,7 +1041,7 @@ dependencies = [
 
 [[package]]
 name = "substreams-ethereum-uniswap-v2"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "anyhow",
  "ethabi 18.0.0",
@@ -1060,7 +1060,7 @@ dependencies = [
 
 [[package]]
 name = "substreams-ethereum-uniswap-v3"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "anyhow",
  "ethabi 18.0.0",
diff --git a/substreams/ethereum-ambient/Cargo.toml b/substreams/ethereum-ambient/Cargo.toml
index 45da3f0..4738c67 100644
--- a/substreams/ethereum-ambient/Cargo.toml
+++ b/substreams/ethereum-ambient/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substreams-ethereum-ambient"
-version = "0.5.0"
+version = "0.5.1"
 edition = "2021"
 
 [lib]
diff --git a/substreams/ethereum-ambient/substreams.yaml b/substreams/ethereum-ambient/substreams.yaml
index 3541139..e3e3805 100644
--- a/substreams/ethereum-ambient/substreams.yaml
+++ b/substreams/ethereum-ambient/substreams.yaml
@@ -1,13 +1,16 @@
 specVersion: v0.1.0
 package:
   name: "substreams_ethereum_ambient"
-  version: v0.5.0
+  version: v0.5.1
 
 protobuf:
   files:
+    - tycho/evm/v1/common.proto
+    - tycho/evm/v1/vm.proto
     - ambient.proto
   importPaths:
-    - ./proto
+    - ./proto/v1
+    - ../../proto/
 
 binaries:
   default:
diff --git a/substreams/ethereum-uniswap-v2/Cargo.toml b/substreams/ethereum-uniswap-v2/Cargo.toml
index 6348817..1979ddd 100644
--- a/substreams/ethereum-uniswap-v2/Cargo.toml
+++ b/substreams/ethereum-uniswap-v2/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substreams-ethereum-uniswap-v2"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 
 [lib]
diff --git a/substreams/ethereum-uniswap-v2/ethereum-pancakeswap.yaml b/substreams/ethereum-uniswap-v2/ethereum-pancakeswap.yaml
index 1944e69..8f56fa8 100644
--- a/substreams/ethereum-uniswap-v2/ethereum-pancakeswap.yaml
+++ b/substreams/ethereum-uniswap-v2/ethereum-pancakeswap.yaml
@@ -1,13 +1,16 @@
 specVersion: v0.1.0
 package:
   name: "ethereum_pancakeswap"
-  version: v0.2.0
+  version: v0.2.1
 
 protobuf:
   files:
+    - tycho/evm/v1/common.proto
+    - tycho/evm/v1/entity.proto
     - uniswap.proto
   importPaths:
     - ./proto/v1
+    - ../../proto/
 
 binaries:
   default:
diff --git a/substreams/ethereum-uniswap-v2/ethereum-sushiswap.yaml b/substreams/ethereum-uniswap-v2/ethereum-sushiswap.yaml
index 8a9233c..075a8b6 100644
--- a/substreams/ethereum-uniswap-v2/ethereum-sushiswap.yaml
+++ b/substreams/ethereum-uniswap-v2/ethereum-sushiswap.yaml
@@ -1,13 +1,16 @@
 specVersion: v0.1.0
 package:
   name: "ethereum_sushiswap_v2"
-  version: v0.2.0
+  version: v0.2.1
 
 protobuf:
   files:
+    - tycho/evm/v1/common.proto
+    - tycho/evm/v1/entity.proto
     - uniswap.proto
   importPaths:
     - ./proto/v1
+    - ../../proto/
 
 binaries:
   default:
diff --git a/substreams/ethereum-uniswap-v2/ethereum-uniswap-v2.yaml b/substreams/ethereum-uniswap-v2/ethereum-uniswap-v2.yaml
index c1e8bb1..3c247a6 100644
--- a/substreams/ethereum-uniswap-v2/ethereum-uniswap-v2.yaml
+++ b/substreams/ethereum-uniswap-v2/ethereum-uniswap-v2.yaml
@@ -1,13 +1,16 @@
 specVersion: v0.1.0
 package:
   name: "ethereum_uniswap_v2"
-  version: v0.2.0
+  version: v0.2.1
 
 protobuf:
   files:
+    - tycho/evm/v1/common.proto
+    - tycho/evm/v1/entity.proto
     - uniswap.proto
   importPaths:
     - ./proto/v1
+    - ../../proto/
 
 binaries:
   default:
diff --git a/substreams/ethereum-uniswap-v3/Cargo.toml b/substreams/ethereum-uniswap-v3/Cargo.toml
index 101914d..edba152 100644
--- a/substreams/ethereum-uniswap-v3/Cargo.toml
+++ b/substreams/ethereum-uniswap-v3/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "substreams-ethereum-uniswap-v3"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 
 [lib]
diff --git a/substreams/ethereum-uniswap-v3/arbitrum-uniswap-v3.yaml b/substreams/ethereum-uniswap-v3/arbitrum-uniswap-v3.yaml
index 4937787..5498de4 100644
--- a/substreams/ethereum-uniswap-v3/arbitrum-uniswap-v3.yaml
+++ b/substreams/ethereum-uniswap-v3/arbitrum-uniswap-v3.yaml
@@ -1,13 +1,16 @@
 specVersion: v0.1.0
 package:
   name: "substreams_arbitrum_uniswap_v3"
-  version: v0.2.0
+  version: v0.2.1
 
 protobuf:
   files:
+    - tycho/evm/v1/common.proto
+    - tycho/evm/v1/entity.proto
     - uniswap.proto
   importPaths:
     - ./proto/v1
+    - ../../proto/
 
 binaries:
   default:
diff --git a/substreams/ethereum-uniswap-v3/ethereum-uniswap-v3.yaml b/substreams/ethereum-uniswap-v3/ethereum-uniswap-v3.yaml
index e26388c..db38c86 100644
--- a/substreams/ethereum-uniswap-v3/ethereum-uniswap-v3.yaml
+++ b/substreams/ethereum-uniswap-v3/ethereum-uniswap-v3.yaml
@@ -1,13 +1,16 @@
 specVersion: v0.1.0
 package:
   name: "substreams_ethereum_uniswap_v3"
-  version: v0.2.0
+  version: v0.2.1
 
 protobuf:
   files:
+    - tycho/evm/v1/common.proto
+    - tycho/evm/v1/entity.proto
     - uniswap.proto
   importPaths:
     - ./proto/v1
+    - ../../proto/
 
 binaries:
   default: