diff --git a/packages/subgraph/manifest/data/arbitrum.json b/packages/subgraph/manifest/data/arbitrum.json
index 0428ea2c..7a2941a6 100644
--- a/packages/subgraph/manifest/data/arbitrum.json
+++ b/packages/subgraph/manifest/data/arbitrum.json
@@ -1,6 +1,9 @@
 {
   "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest",
   "network": "arbitrum-one",
+  "PluginRepo": {
+    "address": null
+  },
   "dataSources": {
     "PluginSetupProcessors": [
       {
@@ -8,11 +11,6 @@
         "address": "0x308a1DC5020c4B5d992F5543a7236c465997fecB",
         "startBlock": 145462184
       }
-    ],
-    "Plugin": {
-      "name": "MyPlugin",
-      "address": null,
-      "startBlock": 7727664
-    }
+    ]
   }
 }
diff --git a/packages/subgraph/manifest/data/arbitrumGoerli.json b/packages/subgraph/manifest/data/arbitrumGoerli.json
index ab3a4f37..c95913ad 100644
--- a/packages/subgraph/manifest/data/arbitrumGoerli.json
+++ b/packages/subgraph/manifest/data/arbitrumGoerli.json
@@ -1,6 +1,9 @@
 {
   "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest",
   "network": "arbitrum-goerli",
+  "PluginRepo": {
+    "address": null
+  },
   "dataSources": {
     "PluginSetupProcessors": [
       {
@@ -8,11 +11,6 @@
         "address": "0x308a1DC5020c4B5d992F5543a7236c465997fecB",
         "startBlock": 51930460
       }
-    ],
-    "Plugin": {
-      "name": "MyPlugin",
-      "address": null,
-      "startBlock": 7727664
-    }
+    ]
   }
 }
diff --git a/packages/subgraph/manifest/data/arbitrumSepolia.json b/packages/subgraph/manifest/data/arbitrumSepolia.json
index a05a2973..725a27a7 100644
--- a/packages/subgraph/manifest/data/arbitrumSepolia.json
+++ b/packages/subgraph/manifest/data/arbitrumSepolia.json
@@ -1,6 +1,9 @@
 {
   "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest",
   "network": "arbitrum-sepolia",
+  "PluginRepo": {
+    "address": null
+  },
   "dataSources": {
     "PluginSetupProcessors": [
       {
@@ -8,11 +11,6 @@
         "address": "0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f",
         "startBlock": 2827173
       }
-    ],
-    "Plugin": {
-      "name": "MyPlugin",
-      "address": null,
-      "startBlock": 7727664
-    }
+    ]
   }
 }
diff --git a/packages/subgraph/manifest/data/baseGoerli.json b/packages/subgraph/manifest/data/baseGoerli.json
index 63f49b34..261bbe2c 100644
--- a/packages/subgraph/manifest/data/baseGoerli.json
+++ b/packages/subgraph/manifest/data/baseGoerli.json
@@ -1,6 +1,9 @@
 {
   "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest",
   "network": "base-testnet",
+  "PluginRepo": {
+    "address": null
+  },
   "dataSources": {
     "PluginSetupProcessors": [
       {
@@ -8,11 +11,6 @@
         "address": "0x6095b5004c59301f8Bb98768Bd395d0bc637C893",
         "startBlock": 7890981
       }
-    ],
-    "Plugin": {
-      "name": "MyPlugin",
-      "address": null,
-      "startBlock": 7727664
-    }
+    ]
   }
 }
diff --git a/packages/subgraph/manifest/data/baseMainnet.json b/packages/subgraph/manifest/data/baseMainnet.json
index 833132c5..1b9bd0fa 100644
--- a/packages/subgraph/manifest/data/baseMainnet.json
+++ b/packages/subgraph/manifest/data/baseMainnet.json
@@ -1,6 +1,9 @@
 {
   "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest",
   "network": "base",
+  "PluginRepo": {
+    "address": null
+  },
   "dataSources": {
     "PluginSetupProcessors": [
       {
@@ -8,11 +11,6 @@
         "address": "0x91a851E9Ed7F2c6d41b15F76e4a88f5A37067cC9",
         "startBlock": 2094737
       }
-    ],
-    "Plugin": {
-      "name": "MyPlugin",
-      "address": null,
-      "startBlock": 7727664
-    }
+    ]
   }
 }
diff --git a/packages/subgraph/manifest/data/baseSepolia.json b/packages/subgraph/manifest/data/baseSepolia.json
index 474f7c3a..f212fb13 100644
--- a/packages/subgraph/manifest/data/baseSepolia.json
+++ b/packages/subgraph/manifest/data/baseSepolia.json
@@ -1,6 +1,9 @@
 {
   "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest",
   "network": "base-sepolia",
+  "PluginRepo": {
+    "address": null
+  },
   "dataSources": {
     "PluginSetupProcessors": [
       {
@@ -8,11 +11,6 @@
         "address": "0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f",
         "startBlock": 3654401
       }
-    ],
-    "Plugin": {
-      "name": "MyPlugin",
-      "address": null,
-      "startBlock": 7727664
-    }
+    ]
   }
 }
diff --git a/packages/subgraph/manifest/data/goerli.json b/packages/subgraph/manifest/data/goerli.json
index 19a0dbb6..656688c6 100644
--- a/packages/subgraph/manifest/data/goerli.json
+++ b/packages/subgraph/manifest/data/goerli.json
@@ -1,6 +1,9 @@
 {
   "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest",
   "network": "goerli",
+  "PluginRepo": {
+    "address": null
+  },
   "dataSources": {
     "PluginSetupProcessors": [
       {
@@ -8,11 +11,6 @@
         "address": "0xE8B5d8D66a02CD1b9Bd32a4064D7ABa45F51305e",
         "startBlock": 8548226
       }
-    ],
-    "Plugin": {
-      "name": "MyPlugin",
-      "address": null,
-      "startBlock": 7727664
-    }
+    ]
   }
 }
diff --git a/packages/subgraph/manifest/data/localhost.json b/packages/subgraph/manifest/data/localhost.json
index 0f778a14..8f071725 100644
--- a/packages/subgraph/manifest/data/localhost.json
+++ b/packages/subgraph/manifest/data/localhost.json
@@ -1,6 +1,9 @@
 {
   "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest",
-  "network": "rinkeby",
+  "network": "sepolia",
+  "PluginRepo": {
+    "address": null
+  },
   "dataSources": {
     "PluginSetupProcessors": [
       {
@@ -8,11 +11,6 @@
         "address": "0x2B8C4DD137104d1E869105cd0106e7D9EF955BfE",
         "startBlock": 7727664
       }
-    ],
-    "Plugin": {
-      "name": "MyPlugin",
-      "address": null,
-      "startBlock": 7727664
-    }
+    ]
   }
 }
diff --git a/packages/subgraph/manifest/data/mainnet.json b/packages/subgraph/manifest/data/mainnet.json
index 81ffcdeb..8a26fa85 100644
--- a/packages/subgraph/manifest/data/mainnet.json
+++ b/packages/subgraph/manifest/data/mainnet.json
@@ -1,6 +1,9 @@
 {
   "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest",
   "network": "mainnet",
+  "PluginRepo": {
+    "address": null
+  },
   "dataSources": {
     "PluginSetupProcessors": [
       {
@@ -8,11 +11,6 @@
         "address": "0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f",
         "startBlock": 16721812
       }
-    ],
-    "Plugin": {
-      "name": "MyPlugin",
-      "address": null,
-      "startBlock": 7727664
-    }
+    ]
   }
 }
diff --git a/packages/subgraph/manifest/data/mumbai.json b/packages/subgraph/manifest/data/mumbai.json
index a6e30681..59f3b517 100644
--- a/packages/subgraph/manifest/data/mumbai.json
+++ b/packages/subgraph/manifest/data/mumbai.json
@@ -1,6 +1,9 @@
 {
   "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest",
   "network": "mumbai",
+  "PluginRepo": {
+    "address": null
+  },
   "dataSources": {
     "PluginSetupProcessors": [
       {
@@ -8,11 +11,6 @@
         "address": "0x9227b311C5cecB416707F1C8B7Ca1b52649AabEc",
         "startBlock": 33514164
       }
-    ],
-    "Plugin": {
-      "name": "MyPlugin",
-      "address": null,
-      "startBlock": 7727664
-    }
+    ]
   }
 }
diff --git a/packages/subgraph/manifest/data/polygon.json b/packages/subgraph/manifest/data/polygon.json
index c831362b..58c7d050 100644
--- a/packages/subgraph/manifest/data/polygon.json
+++ b/packages/subgraph/manifest/data/polygon.json
@@ -1,6 +1,9 @@
 {
   "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest",
   "network": "matic",
+  "PluginRepo": {
+    "address": null
+  },
   "dataSources": {
     "PluginSetupProcessors": [
       {
@@ -8,11 +11,6 @@
         "address": "0x879D9dfe3F36d7684BeC1a2bB4Aa8E8871A7245B",
         "startBlock": 40817440
       }
-    ],
-    "Plugin": {
-      "name": "MyPlugin",
-      "address": null,
-      "startBlock": 7727664
-    }
+    ]
   }
 }
diff --git a/packages/subgraph/manifest/data/sepolia.json b/packages/subgraph/manifest/data/sepolia.json
index 87c67210..78b95633 100644
--- a/packages/subgraph/manifest/data/sepolia.json
+++ b/packages/subgraph/manifest/data/sepolia.json
@@ -1,6 +1,9 @@
 {
   "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest",
   "network": "sepolia",
+  "PluginRepo": {
+    "address": null
+  },
   "dataSources": {
     "PluginSetupProcessors": [
       {
@@ -8,11 +11,6 @@
         "address": "0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f",
         "startBlock": 4415294
       }
-    ],
-    "Plugin": {
-      "name": "MyPlugin",
-      "address": null,
-      "startBlock": 7727664
-    }
+    ]
   }
 }
diff --git a/packages/subgraph/scripts/deploy-subgraph.sh b/packages/subgraph/scripts/deploy-subgraph.sh
index 69c94067..3f7a9db3 100755
--- a/packages/subgraph/scripts/deploy-subgraph.sh
+++ b/packages/subgraph/scripts/deploy-subgraph.sh
@@ -41,7 +41,7 @@ echo '> Subgraph version: '$SUBGRAPH_VERSION
 # check if the repo address is null or zero address
 FILE=manifest/data/$SUBGRAPH_NETWORK_NAME'.json'
 
-address=$(jq -r '.dataSources.Plugin.address' "$FILE")
+address=$(jq -r '.PluginRepo.address' "$FILE")
 
 if [ "$address" = "null" ] || [ "$address" = "0x0000000000000000000000000000000000000000" ];
   then
diff --git a/packages/subgraph/scripts/import-plugin-repo.ts b/packages/subgraph/scripts/import-plugin-repo.ts
index 59bad356..b24590fe 100644
--- a/packages/subgraph/scripts/import-plugin-repo.ts
+++ b/packages/subgraph/scripts/import-plugin-repo.ts
@@ -27,7 +27,7 @@ function extractAndWriteAddressToTS(): void {
   const networkManifestPath = path.join(manifestsPath, `${network}.json`);
   let networkRepoAddress = JSON.parse(
     fs.readFileSync(networkManifestPath, 'utf8')
-  ).dataSources.Plugin.address;
+  ).PluginRepo.address;
 
   // check if address is null and throw warning and continue with zero address
   if (!networkRepoAddress) {