diff --git a/config/graph.arbitrum-goerli.yml b/config/graph.arbitrum-goerli.yml
index 73021f042..fa1a66ad3 100644
--- a/config/graph.arbitrum-goerli.yml
+++ b/config/graph.arbitrum-goerli.yml
@@ -45,6 +45,8 @@ contracts:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
   EpochManager:
     proxy: true
     init:
@@ -53,10 +55,8 @@ contracts:
   L2GraphToken:
     proxy: true
     init:
-      governor: "${{Env.deployer}}"
+      owner: "${{Env.deployer}}"
     calls:
-      - fn: "addMinter"
-        minter: "${{RewardsManager.address}}"
       - fn: "renounceMinter"
       - fn: "transferOwnership"
         owner: *governor
@@ -69,6 +69,8 @@ contracts:
       reserveRatio: 500000 # in parts per million
       curationTaxPercentage: 10000 # in parts per million
       minimumCurationDeposit: "1000000000000000000" # in wei
+    calls:
+      - fn: "syncAllContracts"
   DisputeManager:
     proxy: true
     init:
@@ -78,6 +80,8 @@ contracts:
       fishermanRewardPercentage: 500000 # in parts per million
       idxSlashingPercentage: 25000 # in parts per million
       qrySlashingPercentage: 25000 # in parts per million
+    calls:
+      - fn: "syncAllContracts"
   GNS:
     proxy: true
     init:
@@ -86,6 +90,7 @@ contracts:
       subgraphNFT: "${{SubgraphNFT.address}}"
     calls:
       - fn: "approveAll"
+      - fn: "syncAllContracts"
   SubgraphNFT:
     init:
       governor: "${{Env.deployer}}"
@@ -119,6 +124,7 @@ contracts:
       - fn: "setAssetHolder"
         assetHolder: "${{AllocationExchange.address}}"
         allowed: true
+      - fn: "syncAllContracts"
   RewardsManager:
     proxy: true
     init:
@@ -126,6 +132,7 @@ contracts:
     calls:
       - fn: "setSubgraphAvailabilityOracle"
         subgraphAvailabilityOracle: *availabilityOracle
+      - fn: "syncAllContracts"
   AllocationExchange:
     init:
       graphToken: "${{L2GraphToken.address}}"
@@ -138,3 +145,7 @@ contracts:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
+      - fn: "setPauseGuardian"
+        pauseGuardian: *pauseGuardian
diff --git a/config/graph.arbitrum-localhost.yml b/config/graph.arbitrum-localhost.yml
index 2e185a14a..1061044be 100644
--- a/config/graph.arbitrum-localhost.yml
+++ b/config/graph.arbitrum-localhost.yml
@@ -45,6 +45,8 @@ contracts:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
   EpochManager:
     proxy: true
     init:
@@ -53,10 +55,8 @@ contracts:
   L2GraphToken:
     proxy: true
     init:
-      governor: "${{Env.deployer}}"
+      owner: "${{Env.deployer}}"
     calls:
-      - fn: "addMinter"
-        minter: "${{RewardsManager.address}}"
       - fn: "renounceMinter"
       - fn: "transferOwnership"
         owner: *governor
@@ -69,6 +69,8 @@ contracts:
       reserveRatio: 500000 # in parts per million
       curationTaxPercentage: 10000 # in parts per million
       minimumCurationDeposit: "1000000000000000000" # in wei
+    calls:
+      - fn: "syncAllContracts"
   DisputeManager:
     proxy: true
     init:
@@ -78,6 +80,8 @@ contracts:
       fishermanRewardPercentage: 500000 # in parts per million
       idxSlashingPercentage: 25000 # in parts per million
       qrySlashingPercentage: 25000 # in parts per million
+    calls:
+      - fn: "syncAllContracts"
   GNS:
     proxy: true
     init:
@@ -86,6 +90,7 @@ contracts:
       subgraphNFT: "${{SubgraphNFT.address}}"
     calls:
       - fn: "approveAll"
+      - fn: "syncAllContracts"
   SubgraphNFT:
     init:
       governor: "${{Env.deployer}}"
@@ -119,6 +124,7 @@ contracts:
       - fn: "setAssetHolder"
         assetHolder: "${{AllocationExchange.address}}"
         allowed: true
+      - fn: "syncAllContracts"
   RewardsManager:
     proxy: true
     init:
@@ -126,6 +132,7 @@ contracts:
     calls:
       - fn: "setSubgraphAvailabilityOracle"
         subgraphAvailabilityOracle: *availabilityOracle
+      - fn: "syncAllContracts"
   AllocationExchange:
     init:
       graphToken: "${{L2GraphToken.address}}"
@@ -138,3 +145,7 @@ contracts:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
+      - fn: "setPauseGuardian"
+        pauseGuardian: *pauseGuardian
diff --git a/config/graph.arbitrum-one.yml b/config/graph.arbitrum-one.yml
index 8fb876d8f..e68d67521 100644
--- a/config/graph.arbitrum-one.yml
+++ b/config/graph.arbitrum-one.yml
@@ -45,6 +45,8 @@ contracts:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
   EpochManager:
     proxy: true
     init:
@@ -53,10 +55,8 @@ contracts:
   L2GraphToken:
     proxy: true
     init:
-      governor: "${{Env.deployer}}"
+      owner: "${{Env.deployer}}"
     calls:
-      - fn: "addMinter"
-        minter: "${{RewardsManager.address}}"
       - fn: "renounceMinter"
       - fn: "transferOwnership"
         owner: *governor
@@ -69,6 +69,8 @@ contracts:
       reserveRatio: 500000 # in parts per million
       curationTaxPercentage: 10000 # in parts per million
       minimumCurationDeposit: "1000000000000000000" # in wei
+    calls:
+      - fn: "syncAllContracts"
   DisputeManager:
     proxy: true
     init:
@@ -78,6 +80,8 @@ contracts:
       fishermanRewardPercentage: 500000 # in parts per million
       idxSlashingPercentage: 25000 # in parts per million
       qrySlashingPercentage: 25000 # in parts per million
+    calls:
+      - fn: "syncAllContracts"
   GNS:
     proxy: true
     init:
@@ -86,6 +90,7 @@ contracts:
       subgraphNFT: "${{SubgraphNFT.address}}"
     calls:
       - fn: "approveAll"
+      - fn: "syncAllContracts"
   SubgraphNFT:
     init:
       governor: "${{Env.deployer}}"
@@ -119,6 +124,7 @@ contracts:
       - fn: "setAssetHolder"
         assetHolder: "${{AllocationExchange.address}}"
         allowed: true
+      - fn: "syncAllContracts"
   RewardsManager:
     proxy: true
     init:
@@ -126,6 +132,7 @@ contracts:
     calls:
       - fn: "setSubgraphAvailabilityOracle"
         subgraphAvailabilityOracle: *availabilityOracle
+      - fn: "syncAllContracts"
   AllocationExchange:
     init:
       graphToken: "${{L2GraphToken.address}}"
@@ -138,3 +145,7 @@ contracts:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
+      - fn: "setPauseGuardian"
+        pauseGuardian: *pauseGuardian
diff --git a/config/graph.goerli.yml b/config/graph.goerli.yml
index d24e3c23d..b4b735b4e 100644
--- a/config/graph.goerli.yml
+++ b/config/graph.goerli.yml
@@ -45,6 +45,8 @@ contracts:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
   EpochManager:
     proxy: true
     init:
@@ -68,6 +70,8 @@ contracts:
       reserveRatio: 500000 # in parts per million
       curationTaxPercentage: 10000 # in parts per million
       minimumCurationDeposit: "1000000000000000000" # in wei
+    calls:
+      - fn: "syncAllContracts"
   DisputeManager:
     proxy: true
     init:
@@ -77,6 +81,8 @@ contracts:
       fishermanRewardPercentage: 500000 # in parts per million
       idxSlashingPercentage: 25000 # in parts per million
       qrySlashingPercentage: 25000 # in parts per million
+    calls:
+      - fn: "syncAllContracts"
   GNS:
     proxy: true
     init:
@@ -85,6 +91,7 @@ contracts:
       subgraphNFT: "${{SubgraphNFT.address}}"
     calls:
       - fn: "approveAll"
+      - fn: "syncAllContracts"
   SubgraphNFT:
     init:
       governor: "${{Env.deployer}}"
@@ -118,6 +125,7 @@ contracts:
       - fn: "setAssetHolder"
         assetHolder: "${{AllocationExchange.address}}"
         allowed: true
+      - fn: "syncAllContracts"
   RewardsManager:
     proxy: true
     init:
@@ -127,6 +135,7 @@ contracts:
         issuanceRate: "1000000012184945188" # per block increase of total supply, blocks in a year = 365*60*60*24/13
       - fn: "setSubgraphAvailabilityOracle"
         subgraphAvailabilityOracle: *availabilityOracle
+      - fn: "syncAllContracts"
   AllocationExchange:
     init:
       graphToken: "${{GraphToken.address}}"
@@ -139,7 +148,13 @@ contracts:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
+      - fn: "setPauseGuardian"
+        pauseGuardian: *pauseGuardian
   BridgeEscrow:
     proxy: true
     init:
-      controller: "${{Controller.address}}"
\ No newline at end of file
+      controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
diff --git a/config/graph.localhost.yml b/config/graph.localhost.yml
index d6268c269..4a90dfd20 100644
--- a/config/graph.localhost.yml
+++ b/config/graph.localhost.yml
@@ -45,6 +45,8 @@ contracts:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
   EpochManager:
     proxy: true
     init:
@@ -68,6 +70,8 @@ contracts:
       reserveRatio: 500000 # in parts per million
       curationTaxPercentage: 10000 # in parts per million
       minimumCurationDeposit: "1000000000000000000" # in wei
+    calls:
+      - fn: "syncAllContracts"
   DisputeManager:
     proxy: true
     init:
@@ -77,6 +81,8 @@ contracts:
       fishermanRewardPercentage: 500000 # in parts per million
       idxSlashingPercentage: 25000 # in parts per million
       qrySlashingPercentage: 25000 # in parts per million
+    calls:
+      - fn: "syncAllContracts"
   GNS:
     proxy: true
     init:
@@ -85,6 +91,7 @@ contracts:
       subgraphNFT: "${{SubgraphNFT.address}}"
     calls:
       - fn: "approveAll"
+      - fn: "syncAllContracts"
   SubgraphNFT:
     init:
       governor: "${{Env.deployer}}"
@@ -118,6 +125,7 @@ contracts:
       - fn: "setAssetHolder"
         assetHolder: "${{AllocationExchange.address}}"
         allowed: true
+      - fn: "syncAllContracts"
   RewardsManager:
     proxy: true
     init:
@@ -127,6 +135,7 @@ contracts:
         issuanceRate: "1000000012184945188" # per block increase of total supply, blocks in a year = 365*60*60*24/13
       - fn: "setSubgraphAvailabilityOracle"
         subgraphAvailabilityOracle: *availabilityOracle
+      - fn: "syncAllContracts"
   AllocationExchange:
     init:
       graphToken: "${{GraphToken.address}}"
@@ -139,7 +148,13 @@ contracts:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
+      - fn: "setPauseGuardian"
+        pauseGuardian: *pauseGuardian
   BridgeEscrow:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
diff --git a/config/graph.mainnet.yml b/config/graph.mainnet.yml
index 88e32d38b..6eb08b233 100644
--- a/config/graph.mainnet.yml
+++ b/config/graph.mainnet.yml
@@ -45,6 +45,8 @@ contracts:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
   EpochManager:
     proxy: true
     init:
@@ -68,6 +70,8 @@ contracts:
       reserveRatio: 500000 # in parts per million
       curationTaxPercentage: 10000 # in parts per million
       minimumCurationDeposit: "1000000000000000000" # in wei
+    calls:
+      - fn: "syncAllContracts"
   DisputeManager:
     proxy: true
     init:
@@ -77,6 +81,8 @@ contracts:
       fishermanRewardPercentage: 500000 # in parts per million
       idxSlashingPercentage: 25000 # in parts per million
       qrySlashingPercentage: 25000 # in parts per million
+    calls:
+      - fn: "syncAllContracts"
   GNS:
     proxy: true
     init:
@@ -85,6 +91,7 @@ contracts:
       subgraphNFT: "${{SubgraphNFT.address}}"
     calls:
       - fn: "approveAll"
+      - fn: "syncAllContracts"
   SubgraphNFT:
     init:
       governor: "${{Env.deployer}}"
@@ -118,6 +125,7 @@ contracts:
       - fn: "setAssetHolder"
         assetHolder: "${{AllocationExchange.address}}"
         allowed: true
+      - fn: "syncAllContracts"
   RewardsManager:
     proxy: true
     init:
@@ -127,6 +135,7 @@ contracts:
         issuanceRate: "1000000012184945188" # per block increase of total supply, blocks in a year = 365*60*60*24/13
       - fn: "setSubgraphAvailabilityOracle"
         subgraphAvailabilityOracle: *availabilityOracle
+      - fn: "syncAllContracts"
   AllocationExchange:
     init:
       graphToken: "${{GraphToken.address}}"
@@ -139,7 +148,13 @@ contracts:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
+      - fn: "setPauseGuardian"
+        pauseGuardian: *pauseGuardian
   BridgeEscrow:
     proxy: true
     init:
       controller: "${{Controller.address}}"
+    calls:
+      - fn: "syncAllContracts"
diff --git a/test/lib/fixtures.ts b/test/lib/fixtures.ts
index ae6832938..8375a86a4 100644
--- a/test/lib/fixtures.ts
+++ b/test/lib/fixtures.ts
@@ -159,7 +159,9 @@ export class NetworkFixture {
 
     await staking.connect(deployer).setSlasher(slasherAddress, true)
     await gns.connect(deployer).approveAll()
-    await grt.connect(deployer).addMinter(rewardsManager.address)
+    if (!isL2) {
+      await grt.connect(deployer).addMinter(rewardsManager.address)
+    }
 
     // Unpause the protocol
     await controller.connect(deployer).setPaused(false)