diff --git a/src/constants.ts b/src/constants.ts
index b28083b..c25bdc0 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1,6 +1,6 @@
 import { BigInt } from "@graphprotocol/graph-ts";
 
 // matic
-export let BLOCK_SIDEVIEWS_ACTIVATED = BigInt.fromI32(4273);
+export let BLOCK_SIDEVIEWS_ACTIVATED = BigInt.fromI32(18371153);
 
-export const AAVEGOTCHI_DIAMOND = "0xD66C6C61D5a535eD69E3769582895daec28a4651";
+export const AAVEGOTCHI_DIAMOND = "0xb8D555680BCD42724DfdFeEa774D1C7890BE143f";
diff --git a/subgraph.baseSepolia.yaml b/subgraph.baseSepolia.yaml
index c3f19c4..cb4f5a6 100644
--- a/subgraph.baseSepolia.yaml
+++ b/subgraph.baseSepolia.yaml
@@ -6,9 +6,9 @@ dataSources:
     name: Contract
     network: base-sepolia
     source:
-      address: "0x87C969d083189927049f8fF3747703FB9f7a8AEd"
+      address: "0xb8D555680BCD42724DfdFeEa774D1C7890BE143f"
       abi: Contract
-      startBlock: 16665803
+      startBlock: 18371153
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.6