diff --git a/Arbitrum/arbitrum-nova-starter/project.ts b/Arbitrum/arbitrum-nova-starter/project.ts
index 7e5c8760..a08eadff 100644
--- a/Arbitrum/arbitrum-nova-starter/project.ts
+++ b/Arbitrum/arbitrum-nova-starter/project.ts
@@ -37,7 +37,7 @@ const project: EthereumProject = {
      * When developing your project we suggest getting a private API key
      */
     endpoint: ["https://nova.arbitrum.io/rpc"],
-    // dictionary: "https://gx.api.subquery.network/sq/subquery/arbitrum-nova-dictionary" - we don't have one for Nova
+    dictionary: 'https://dict-tyk.subquery.network/query/arbitrum-nova'
   },
   dataSources: [
     {
diff --git a/Arbitrum/arbitrum-nova-starter/src/mappings/mappingHandlers.ts b/Arbitrum/arbitrum-nova-starter/src/mappings/mappingHandlers.ts
index c19f068d..662862b3 100644
--- a/Arbitrum/arbitrum-nova-starter/src/mappings/mappingHandlers.ts
+++ b/Arbitrum/arbitrum-nova-starter/src/mappings/mappingHandlers.ts
@@ -35,3 +35,4 @@ export async function handleTransaction(tx: ApproveTransaction): Promise<void> {
 
   await approval.save();
 }
+
diff --git a/Astar/astar-zkevm-testnet-starter/project.ts b/Astar/astar-zkevm-testnet-starter/project.ts
index e3111fe4..ff958096 100644
--- a/Astar/astar-zkevm-testnet-starter/project.ts
+++ b/Astar/astar-zkevm-testnet-starter/project.ts
@@ -38,7 +38,6 @@ const project: EthereumProject = {
      */
     endpoint: ["https://rpc.zkatana.gelato.digital"],
     // Recommended to provide the HTTP endpoint of a full chain dictionary to speed up processing
-    // dictionary: "",
   },
   dataSources: [
     {
diff --git a/Base/base-nft/project.ts b/Base/base-nft/project.ts
index 8e208b4e..86072071 100644
--- a/Base/base-nft/project.ts
+++ b/Base/base-nft/project.ts
@@ -37,6 +37,7 @@ const project: EthereumProject = {
      * When developing your project we suggest getting a private API key
      */
     endpoint: ["https://mainnet.base.org/", "https://rpc.notadegen.com/base"],
+    dictionary: "https://dict-tyk.subquery.network/query/base-mainnet",
   },
   dataSources: [
     {
diff --git a/Ethereum/ethereum-bayc/project.ts b/Ethereum/ethereum-bayc/project.ts
index 15439cca..6ca15c51 100644
--- a/Ethereum/ethereum-bayc/project.ts
+++ b/Ethereum/ethereum-bayc/project.ts
@@ -37,7 +37,7 @@ const project: EthereumProject = {
      # We suggest providing an array of endpoints for increased speed and reliability
      */
     endpoint: ["https://eth.api.onfinality.io/public"],
-    dictionary: "https://gx.api.subquery.network/sq/subquery/eth-dictionary",
+    dictionary: "https://dict-tyk.subquery.network/query/eth-mainnet",
   },
   dataSources: [
     {
diff --git a/Ethereum/ethereum-bayc/tsconfig.json b/Ethereum/ethereum-bayc/tsconfig.json
index 7967307e..90e06e25 100644
--- a/Ethereum/ethereum-bayc/tsconfig.json
+++ b/Ethereum/ethereum-bayc/tsconfig.json
@@ -14,7 +14,7 @@
   },
   "include": [
     "src/**/*",
-    "../../node_modules/@subql/types-core/dist/global.d.ts",
-    "../../node_modules/@subql/types-ethereum/dist/global.d.ts"
+    "node_modules/@subql/types-core/dist/global.d.ts",
+    "node_modules/@subql/types-ethereum/dist/global.d.ts"
   ]
 }
diff --git a/Ethereum/ethereum-chainlink/project.ts b/Ethereum/ethereum-chainlink/project.ts
index 1722e963..58ca3e8e 100644
--- a/Ethereum/ethereum-chainlink/project.ts
+++ b/Ethereum/ethereum-chainlink/project.ts
@@ -37,7 +37,7 @@ const project: EthereumProject = {
      * When developing your project we suggest getting a private API key
      */
     endpoint: ["https://eth.api.onfinality.io/public"],
-    dictionary: "https://gx.api.subquery.network/sq/subquery/eth-dictionary",
+    dictionary: "https://dict-tyk.subquery.network/query/eth-mainnet",
   },
   dataSources: [
     {
diff --git a/Ethereum/ethereum-chainlink/tsconfig.json b/Ethereum/ethereum-chainlink/tsconfig.json
index 26436862..90e06e25 100644
--- a/Ethereum/ethereum-chainlink/tsconfig.json
+++ b/Ethereum/ethereum-chainlink/tsconfig.json
@@ -12,5 +12,9 @@
     "target": "es2017",
     "strict": true
   },
-  "include": ["src/**/*", "node_modules/@subql/types-ethereum/dist/global.d.ts"]
+  "include": [
+    "src/**/*",
+    "node_modules/@subql/types-core/dist/global.d.ts",
+    "node_modules/@subql/types-ethereum/dist/global.d.ts"
+  ]
 }
diff --git a/Ethereum/ethereum-gravatar/project.ts b/Ethereum/ethereum-gravatar/project.ts
index 311076da..ae9d1483 100644
--- a/Ethereum/ethereum-gravatar/project.ts
+++ b/Ethereum/ethereum-gravatar/project.ts
@@ -37,7 +37,7 @@ const project: EthereumProject = {
      * When developing your project we suggest getting a private API key
      */
     endpoint: ["https://eth.api.onfinality.io/public"],
-    dictionary: "https://gx.api.subquery.network/sq/subquery/eth-dictionary",
+    dictionary: "https://dict-tyk.subquery.network/query/eth-mainnet",
   },
   dataSources: [
     {
diff --git a/Ethereum/ethereum-opensea/project.ts b/Ethereum/ethereum-opensea/project.ts
index bf758951..2ad06c19 100644
--- a/Ethereum/ethereum-opensea/project.ts
+++ b/Ethereum/ethereum-opensea/project.ts
@@ -37,7 +37,7 @@ const project: EthereumProject = {
      * When developing your project we suggest getting a private API key
      */
     endpoint: ["https://eth.api.onfinality.io/public"],
-    dictionary: "https://gx.api.subquery.network/sq/subquery/eth-dictionary",
+    dictionary: "https://dict-tyk.subquery.network/query/eth-mainnet",
   },
   dataSources: [
     {
diff --git a/Ethereum/ethereum-starter/project.ts b/Ethereum/ethereum-starter/project.ts
index ca8b659d..44f3d960 100644
--- a/Ethereum/ethereum-starter/project.ts
+++ b/Ethereum/ethereum-starter/project.ts
@@ -37,7 +37,7 @@ const project: EthereumProject = {
      * When developing your project we suggest getting a private API key
      */
     endpoint: ["https://eth.api.onfinality.io/public"],
-    dictionary: "https://gx.api.subquery.network/sq/subquery/eth-dictionary",
+    dictionary: "https://dict-tyk.subquery.network/query/eth-mainnet",
   },
   dataSources: [
     {
diff --git a/Ethereum/ethereum-uniswap-v3/project.ts b/Ethereum/ethereum-uniswap-v3/project.ts
index 16e2d9fa..97bb7d7c 100644
--- a/Ethereum/ethereum-uniswap-v3/project.ts
+++ b/Ethereum/ethereum-uniswap-v3/project.ts
@@ -37,7 +37,7 @@ const project: EthereumProject = {
      * When developing your project we suggest getting a private API key
      */
     endpoint: ["https://eth.api.onfinality.io/public"],
-    dictionary: "https://gx.api.subquery.network/sq/subquery/eth-dictionary",
+    dictionary: "https://dict-tyk.subquery.network/query/eth-mainnet",
   },
   dataSources: [
     {
diff --git a/Ethereum/ethereum-uniswap-v3/tsconfig.json b/Ethereum/ethereum-uniswap-v3/tsconfig.json
index 26436862..90e06e25 100644
--- a/Ethereum/ethereum-uniswap-v3/tsconfig.json
+++ b/Ethereum/ethereum-uniswap-v3/tsconfig.json
@@ -12,5 +12,9 @@
     "target": "es2017",
     "strict": true
   },
-  "include": ["src/**/*", "node_modules/@subql/types-ethereum/dist/global.d.ts"]
+  "include": [
+    "src/**/*",
+    "node_modules/@subql/types-core/dist/global.d.ts",
+    "node_modules/@subql/types-ethereum/dist/global.d.ts"
+  ]
 }
diff --git a/Gnosis/gnosis-poap/project.ts b/Gnosis/gnosis-poap/project.ts
index bfa9115e..5d79a439 100644
--- a/Gnosis/gnosis-poap/project.ts
+++ b/Gnosis/gnosis-poap/project.ts
@@ -42,7 +42,7 @@ const project: EthereumProject = {
       // "https://opt-mainnet.g.alchemy.com/v2/demo",
       "https://rpc.gnosischain.com",
     ],
-    dictionary: "https://api.subquery.network/sq/subquery/gnosis-dictionary",
+    dictionary: "https://dict-tyk.subquery.network/query/gnosis-mainnet",
   },
   dataSources: [
     {
diff --git a/Gnosis/gnosis-starter/project.ts b/Gnosis/gnosis-starter/project.ts
index 48fb58b3..1cfd18f1 100644
--- a/Gnosis/gnosis-starter/project.ts
+++ b/Gnosis/gnosis-starter/project.ts
@@ -42,7 +42,7 @@ const project: EthereumProject = {
       // "https://opt-mainnet.g.alchemy.com/v2/demo",
       "https://rpc.gnosischain.com",
     ],
-    dictionary: "https://api.subquery.network/sq/subquery/gnosis-dictionary",
+    dictionary: "https://dict-tyk.subquery.network/query/gnosis-mainnet",
   },
   dataSources: [
     {
diff --git a/Linea/linea-starter/project.ts b/Linea/linea-starter/project.ts
index c0cac788..b0d284c8 100644
--- a/Linea/linea-starter/project.ts
+++ b/Linea/linea-starter/project.ts
@@ -38,7 +38,7 @@ const project: EthereumProject = {
      */
     endpoint: ["https://linea.blockpi.network/v1/rpc/public"],
     // Recommended to provide the HTTP endpoint of a full chain dictionary to speed up processing
-    // dictionary: "https://gx.api.subquery.network/sq/subquery/linea-dictionary"
+    dictionary: 'https://dict-tyk.subquery.network/query/linea-mainnet'
   },
   dataSources: [
     {
diff --git a/Multi-Chain/galxe/ethereum.yaml b/Multi-Chain/galxe/ethereum.yaml
index 2dbbfeee..ad37b932 100644
--- a/Multi-Chain/galxe/ethereum.yaml
+++ b/Multi-Chain/galxe/ethereum.yaml
@@ -15,7 +15,7 @@ network:
   chainId: "1"
   endpoint:
     - https://eth.llamarpc.com
-  dictionary: https://gx.api.subquery.network/sq/subquery/eth-dictionary
+  dictionary: https://dict-tyk.subquery.network/query/eth-mainnet
 dataSources:
   - kind: ethereum/Runtime
     name: SpaceStationV1
diff --git a/Multi-Chain/galxe/polygon.yaml b/Multi-Chain/galxe/polygon.yaml
index 655c1602..d34d260f 100644
--- a/Multi-Chain/galxe/polygon.yaml
+++ b/Multi-Chain/galxe/polygon.yaml
@@ -15,7 +15,7 @@ network:
   chainId: "137"
   endpoint:
     - https://polygon.llamarpc.com
-  dictionary: https://gx.api.subquery.network/sq/subquery/polygon-dictionary
+  dictionary: https://dict-tyk.subquery.network/query/polygon
 dataSources:
   - kind: ethereum/Runtime
     name: SpaceStationV1
diff --git a/Multi-Chain/polygon-plasma-bridge/ethereum.yaml b/Multi-Chain/polygon-plasma-bridge/ethereum.yaml
index cf6a4002..8e4f102c 100644
--- a/Multi-Chain/polygon-plasma-bridge/ethereum.yaml
+++ b/Multi-Chain/polygon-plasma-bridge/ethereum.yaml
@@ -24,7 +24,7 @@ network:
   # When developing your project we suggest getting a private API key
   endpoint: "https://eth.api.onfinality.io/public"
   # Recommended to provide the HTTP endpoint of a full chain dictionary to speed up processing
-  dictionary: "https://gx.api.subquery.network/sq/subquery/polygon-dictionary"
+  dictionary: "https://dict-tyk.subquery.network/query/eth-mainnet"
 
 dataSources:
   - kind: ethereum/Runtime # We use ethereum runtime since Polygon is a layer-2 that is compatible
diff --git a/Multi-Chain/polygon-plasma-bridge/polygon.yaml b/Multi-Chain/polygon-plasma-bridge/polygon.yaml
index e838ac1a..0bca429e 100644
--- a/Multi-Chain/polygon-plasma-bridge/polygon.yaml
+++ b/Multi-Chain/polygon-plasma-bridge/polygon.yaml
@@ -24,7 +24,7 @@ network:
   # When developing your project we suggest getting a private API key
   endpoint: "https://polygon.api.onfinality.io/public"
   # Recommended to provide the HTTP endpoint of a full chain dictionary to speed up processing
-  dictionary: "https://gx.api.subquery.network/sq/subquery/polygon-dictionary"
+  dictionary: "https://dict-tyk.subquery.network/query/polygon"
 
 dataSources:
   - kind: ethereum/Runtime # We use ethereum runtime since Polygon is a layer-2 that is compatible
diff --git a/Multi-Chain/safe/ethereum.yaml b/Multi-Chain/safe/ethereum.yaml
index 49a49284..debfd5f4 100644
--- a/Multi-Chain/safe/ethereum.yaml
+++ b/Multi-Chain/safe/ethereum.yaml
@@ -15,7 +15,7 @@ network:
   chainId: "1"
   endpoint:
     - https://eth.llamarpc.com
-  dictionary: https://gx.api.subquery.network/sq/subquery/eth-dictionary
+  dictionary: "https://dict-tyk.subquery.network/query/eth-mainnet"
 dataSources:
   - kind: ethereum/Runtime
     startBlock: 7450116
diff --git a/Multi-Chain/safe/matic.yaml b/Multi-Chain/safe/matic.yaml
index ef383964..ab07b612 100644
--- a/Multi-Chain/safe/matic.yaml
+++ b/Multi-Chain/safe/matic.yaml
@@ -15,7 +15,7 @@ network:
   chainId: "137"
   endpoint:
     - https://polygon.llamarpc.com
-  dictionary: https://gx.api.subquery.network/sq/subquery/polygon-dictionary
+  dictionary: "https://dict-tyk.subquery.network/query/polygon"
 dataSources:
   - kind: ethereum/Runtime
     startBlock: 45222934
diff --git a/Multi-Chain/snapshot/ethereum.yaml b/Multi-Chain/snapshot/ethereum.yaml
index 107ece2f..5fd10dcc 100644
--- a/Multi-Chain/snapshot/ethereum.yaml
+++ b/Multi-Chain/snapshot/ethereum.yaml
@@ -15,7 +15,7 @@ network:
   chainId: "1"
   endpoint:
     - https://eth.llamarpc.com
-  dictionary: https://gx.api.subquery.network/sq/subquery/eth-dictionary
+  dictionary: "https://dict-tyk.subquery.network/query/eth-mainnet"
 dataSources:
   - kind: ethereum/Runtime
     startBlock: 11225329
diff --git a/Multi-Chain/snapshot/goerli.yaml b/Multi-Chain/snapshot/goerli.yaml
index 5eac8e41..6cefdd21 100644
--- a/Multi-Chain/snapshot/goerli.yaml
+++ b/Multi-Chain/snapshot/goerli.yaml
@@ -15,7 +15,7 @@ network:
   chainId: "5"
   endpoint:
     - wss://ethereum-goerli.publicnode.com
-  # dictionary: TODO add a dictionary
+  dictionary:
 dataSources:
   - kind: ethereum/Runtime
     startBlock: 7383494
diff --git a/Multi-Chain/snapshot/matic.yaml b/Multi-Chain/snapshot/matic.yaml
index a752d3f2..3c272bdc 100644
--- a/Multi-Chain/snapshot/matic.yaml
+++ b/Multi-Chain/snapshot/matic.yaml
@@ -15,7 +15,7 @@ network:
   chainId: "137"
   endpoint:
     - https://polygon.llamarpc.com
-  dictionary: https://gx.api.subquery.network/sq/subquery/polygon-dictionary
+  dictionary: "https://dict-tyk.subquery.network/query/polygon"
 dataSources:
   - kind: ethereum/Runtime
     startBlock: 7407807
diff --git a/Polygon/polygon-lens/project.ts b/Polygon/polygon-lens/project.ts
index 501e0dc7..31a43010 100644
--- a/Polygon/polygon-lens/project.ts
+++ b/Polygon/polygon-lens/project.ts
@@ -39,8 +39,7 @@ const project: EthereumProject = {
      */
     endpoint: ["https://polygon.api.onfinality.io/public"],
     // Recommended to provide the HTTP endpoint of a full chain dictionary to speed up processing
-    dictionary:
-      "https://gx.api.subquery.network/sq/subquery/polygon-dictionary",
+    dictionary: "https://dict-tyk.subquery.network/query/polygon"
   },
   dataSources: [
     {
diff --git a/Polygon/polygon-plasma-bridge/project.ts b/Polygon/polygon-plasma-bridge/project.ts
index 13cd8ef5..99771427 100644
--- a/Polygon/polygon-plasma-bridge/project.ts
+++ b/Polygon/polygon-plasma-bridge/project.ts
@@ -38,8 +38,7 @@ const project: EthereumProject = {
      */
     endpoint: "https://polygon.api.onfinality.io/public",
     // Recommended to provide the HTTP endpoint of a full chain dictionary to speed up processing
-    dictionary:
-      "https://gx.api.subquery.network/sq/subquery/polygon-dictionary",
+    dictionary: 'https://dict-tyk.subquery.network/query/polygon'
   },
   dataSources: [
     {
diff --git a/Polygon/polygon-starter/project.ts b/Polygon/polygon-starter/project.ts
index bcf3b95f..fcaa7081 100644
--- a/Polygon/polygon-starter/project.ts
+++ b/Polygon/polygon-starter/project.ts
@@ -38,8 +38,7 @@ const project: EthereumProject = {
      */
     endpoint: ["https://polygon.api.onfinality.io/public"],
     // Recommended to provide the HTTP endpoint of a full chain dictionary to speed up processing
-    dictionary:
-      "https://gx.api.subquery.network/sq/subquery/polygon-dictionary",
+    dictionary: 'https://dict-tyk.subquery.network/query/polygon'
   },
   dataSources: [
     {