diff --git a/packages/automation-contracts/autowrap/package.json b/packages/automation-contracts/autowrap/package.json
index b7a8dd9127..f26d9df987 100644
--- a/packages/automation-contracts/autowrap/package.json
+++ b/packages/automation-contracts/autowrap/package.json
@@ -15,6 +15,6 @@
     "dependencies": {
         "@openzeppelin/contracts": "4.9.3",
         "@superfluid-finance/ethereum-contracts": "1.8.1",
-        "@superfluid-finance/metadata": "1.1.20"
+        "@superfluid-finance/metadata": "1.1.21"
     }
 }
diff --git a/packages/automation-contracts/scheduler/package.json b/packages/automation-contracts/scheduler/package.json
index f4293f9c66..7735dd40a0 100644
--- a/packages/automation-contracts/scheduler/package.json
+++ b/packages/automation-contracts/scheduler/package.json
@@ -15,6 +15,6 @@
     "dependencies": {
         "@openzeppelin/contracts": "4.9.3",
         "@superfluid-finance/ethereum-contracts": "1.8.1",
-        "@superfluid-finance/metadata": "1.1.20"
+        "@superfluid-finance/metadata": "1.1.21"
     }
 }
diff --git a/packages/ethereum-contracts/package.json b/packages/ethereum-contracts/package.json
index ae93ceb9af..acc73d5416 100644
--- a/packages/ethereum-contracts/package.json
+++ b/packages/ethereum-contracts/package.json
@@ -91,7 +91,7 @@
         "@safe-global/safe-service-client": "^2.0.3",
         "@safe-global/safe-web3-lib": "^1.9.4",
         "@superfluid-finance/js-sdk": "0.6.3",
-        "@superfluid-finance/metadata": "1.1.20",
+        "@superfluid-finance/metadata": "1.1.21",
         "async": "^3.2.4",
         "csv-writer": "^1.6.0",
         "ethers": "^5.7.2",
diff --git a/packages/ethereum-contracts/truffle-config.js b/packages/ethereum-contracts/truffle-config.js
index 406dbe9f92..71d5140a13 100644
--- a/packages/ethereum-contracts/truffle-config.js
+++ b/packages/ethereum-contracts/truffle-config.js
@@ -207,7 +207,7 @@ const E = (module.exports = {
             ...createNetworkDefaultConfiguration("polygon-mainnet"),
             network_id: 137,
             maxPriorityFeePerGas: 31e9,
-            maxFeePerGas: 500e9,
+            maxFeePerGas: 1500e9,
         },
 
         "polygon-mumbai": {
diff --git a/packages/js-sdk/package.json b/packages/js-sdk/package.json
index 4c0e72d0ba..f2b9c858da 100644
--- a/packages/js-sdk/package.json
+++ b/packages/js-sdk/package.json
@@ -43,7 +43,7 @@
         "cloc": "sh tasks/cloc.sh"
     },
     "dependencies": {
-        "@superfluid-finance/metadata": "1.1.20",
+        "@superfluid-finance/metadata": "1.1.21",
         "@truffle/contract": "4.6.29",
         "auto-bind": "4.0.0",
         "node-fetch": "2.7.0"
diff --git a/packages/metadata/CHANGELOG.md b/packages/metadata/CHANGELOG.md
index fd59f53c96..6e09b6b4ce 100644
--- a/packages/metadata/CHANGELOG.md
+++ b/packages/metadata/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to the metadata will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.1.21]
+### Changed
+- New contract addresses for Resolver and SuperfluidLoader on xdai-mainnet and polygon-mainnet
+
 ## [v1.1.20]
 ### Changed
 - New contract addresses for Resolver and SuperfluidLoader on eth-goerli and polygon-mumbai
diff --git a/packages/metadata/main/networks/list.cjs b/packages/metadata/main/networks/list.cjs
index 050ac5e521..019ccc1e77 100644
--- a/packages/metadata/main/networks/list.cjs
+++ b/packages/metadata/main/networks/list.cjs
@@ -377,7 +377,7 @@ module.exports =
         "nativeTokenSymbol": "xDAI",
         "nativeTokenWrapper": "0x59988e47A3503AaFaA0368b9deF095c818Fdca01",
         "contractsV1": {
-            "resolver": "0xD2009765189164b495c110D61e4D301729079911",
+            "resolver": "0x9634Fa35188C59DD3B0ADa0Dd9adD7e4ECefc0a9",
             "host": "0x2dFe937cD98Ab92e59cF3139138f18c823a4efE7",
             "governance": "0xaCc7380323681fdb8a0B9F2FE7d69dDFf0664478",
             "cfaV1": "0xEbdA4ceF883A7B12c4E669Ebc58927FBa8447C7D",
@@ -386,7 +386,7 @@ module.exports =
             "superTokenFactory": "0x23410e2659380784498509698ed70E414D384880",
             "constantOutflowNFT": "0xfC00dEE8a980110c5608A823a5B3af3872635456",
             "constantInflowNFT": "0x1497440B4E92DC4ca0F76223b28C20Cb9cB8a0f1",
-            "superfluidLoader": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136",
+            "superfluidLoader": "0xf941528d82D0eD2314FaBBA8bC8f285D1956A657",
             "toga": "0xb7DE52F4281a7a276E18C40F94cd93159C4A2d22",
             "batchLiquidator": "0x27636F8E129cdd4ccA0F30E2b4C116DDaC773bE5",
             "superSpreader": "0x74CDF863b00789c29734F8dFd9F83423Bc55E4cE",
@@ -438,7 +438,7 @@ module.exports =
         "nativeTokenSymbol": "MATIC",
         "nativeTokenWrapper": "0x3aD736904E9e65189c3000c7DD2c8AC8bB7cD4e3",
         "contractsV1": {
-            "resolver": "0xE0cc76334405EE8b39213E620587d815967af39C",
+            "resolver": "0x8bDCb5613153f41B2856F71Bd7A7e0432F6dbe58",
             "host": "0x3E14dC1b13c488a8d5D310918780c983bD5982E7",
             "governance": "0x3AD3f7A0965Ce6f9358AD5CCE86Bc2b05F1EE087",
             "cfaV1": "0x6EeE6060f715257b970700bc2656De21dEdF074C",
@@ -447,7 +447,7 @@ module.exports =
             "superTokenFactory": "0x2C90719f25B10Fc5646c82DA3240C76Fa5BcCF34",
             "constantOutflowNFT": "0x554e2bbaCF43FD87417b7201A9F1649a3ED89d68",
             "constantInflowNFT": "0x55909bB8cd8276887Aae35118d60b19755201c68",
-            "superfluidLoader": "0x15F0Ca26781C3852f8166eD2ebce5D18265cceb7",
+            "superfluidLoader": "0xA3d2A6Db274722e802AC025d667041ecAb094FE7",
             "toga": "0x6AEAeE5Fd4D05A741723D752D30EE4D72690A8f7",
             "batchLiquidator": "0xA6Cdb472e7E22Bf30ae6fB752E4a13eBF3c12165",
             "flowScheduler": "0x55F7758dd99d5e185f4CC08d4Ad95B71f598264D",
diff --git a/packages/metadata/module/networks/list.js b/packages/metadata/module/networks/list.js
index e095cc2d9d..9310de26ab 100644
--- a/packages/metadata/module/networks/list.js
+++ b/packages/metadata/module/networks/list.js
@@ -377,7 +377,7 @@ export default
         "nativeTokenSymbol": "xDAI",
         "nativeTokenWrapper": "0x59988e47A3503AaFaA0368b9deF095c818Fdca01",
         "contractsV1": {
-            "resolver": "0xD2009765189164b495c110D61e4D301729079911",
+            "resolver": "0x9634Fa35188C59DD3B0ADa0Dd9adD7e4ECefc0a9",
             "host": "0x2dFe937cD98Ab92e59cF3139138f18c823a4efE7",
             "governance": "0xaCc7380323681fdb8a0B9F2FE7d69dDFf0664478",
             "cfaV1": "0xEbdA4ceF883A7B12c4E669Ebc58927FBa8447C7D",
@@ -386,7 +386,7 @@ export default
             "superTokenFactory": "0x23410e2659380784498509698ed70E414D384880",
             "constantOutflowNFT": "0xfC00dEE8a980110c5608A823a5B3af3872635456",
             "constantInflowNFT": "0x1497440B4E92DC4ca0F76223b28C20Cb9cB8a0f1",
-            "superfluidLoader": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136",
+            "superfluidLoader": "0xf941528d82D0eD2314FaBBA8bC8f285D1956A657",
             "toga": "0xb7DE52F4281a7a276E18C40F94cd93159C4A2d22",
             "batchLiquidator": "0x27636F8E129cdd4ccA0F30E2b4C116DDaC773bE5",
             "superSpreader": "0x74CDF863b00789c29734F8dFd9F83423Bc55E4cE",
@@ -438,7 +438,7 @@ export default
         "nativeTokenSymbol": "MATIC",
         "nativeTokenWrapper": "0x3aD736904E9e65189c3000c7DD2c8AC8bB7cD4e3",
         "contractsV1": {
-            "resolver": "0xE0cc76334405EE8b39213E620587d815967af39C",
+            "resolver": "0x8bDCb5613153f41B2856F71Bd7A7e0432F6dbe58",
             "host": "0x3E14dC1b13c488a8d5D310918780c983bD5982E7",
             "governance": "0x3AD3f7A0965Ce6f9358AD5CCE86Bc2b05F1EE087",
             "cfaV1": "0x6EeE6060f715257b970700bc2656De21dEdF074C",
@@ -447,7 +447,7 @@ export default
             "superTokenFactory": "0x2C90719f25B10Fc5646c82DA3240C76Fa5BcCF34",
             "constantOutflowNFT": "0x554e2bbaCF43FD87417b7201A9F1649a3ED89d68",
             "constantInflowNFT": "0x55909bB8cd8276887Aae35118d60b19755201c68",
-            "superfluidLoader": "0x15F0Ca26781C3852f8166eD2ebce5D18265cceb7",
+            "superfluidLoader": "0xA3d2A6Db274722e802AC025d667041ecAb094FE7",
             "toga": "0x6AEAeE5Fd4D05A741723D752D30EE4D72690A8f7",
             "batchLiquidator": "0xA6Cdb472e7E22Bf30ae6fB752E4a13eBF3c12165",
             "flowScheduler": "0x55F7758dd99d5e185f4CC08d4Ad95B71f598264D",
diff --git a/packages/metadata/networks.json b/packages/metadata/networks.json
index 7ea7d52d01..e52a3f7000 100644
--- a/packages/metadata/networks.json
+++ b/packages/metadata/networks.json
@@ -375,7 +375,7 @@
         "nativeTokenSymbol": "xDAI",
         "nativeTokenWrapper": "0x59988e47A3503AaFaA0368b9deF095c818Fdca01",
         "contractsV1": {
-            "resolver": "0xD2009765189164b495c110D61e4D301729079911",
+            "resolver": "0x9634Fa35188C59DD3B0ADa0Dd9adD7e4ECefc0a9",
             "host": "0x2dFe937cD98Ab92e59cF3139138f18c823a4efE7",
             "governance": "0xaCc7380323681fdb8a0B9F2FE7d69dDFf0664478",
             "cfaV1": "0xEbdA4ceF883A7B12c4E669Ebc58927FBa8447C7D",
@@ -384,7 +384,7 @@
             "superTokenFactory": "0x23410e2659380784498509698ed70E414D384880",
             "constantOutflowNFT": "0xfC00dEE8a980110c5608A823a5B3af3872635456",
             "constantInflowNFT": "0x1497440B4E92DC4ca0F76223b28C20Cb9cB8a0f1",
-            "superfluidLoader": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136",
+            "superfluidLoader": "0xf941528d82D0eD2314FaBBA8bC8f285D1956A657",
             "toga": "0xb7DE52F4281a7a276E18C40F94cd93159C4A2d22",
             "batchLiquidator": "0x27636F8E129cdd4ccA0F30E2b4C116DDaC773bE5",
             "superSpreader": "0x74CDF863b00789c29734F8dFd9F83423Bc55E4cE",
@@ -436,7 +436,7 @@
         "nativeTokenSymbol": "MATIC",
         "nativeTokenWrapper": "0x3aD736904E9e65189c3000c7DD2c8AC8bB7cD4e3",
         "contractsV1": {
-            "resolver": "0xE0cc76334405EE8b39213E620587d815967af39C",
+            "resolver": "0x8bDCb5613153f41B2856F71Bd7A7e0432F6dbe58",
             "host": "0x3E14dC1b13c488a8d5D310918780c983bD5982E7",
             "governance": "0x3AD3f7A0965Ce6f9358AD5CCE86Bc2b05F1EE087",
             "cfaV1": "0x6EeE6060f715257b970700bc2656De21dEdF074C",
@@ -445,7 +445,7 @@
             "superTokenFactory": "0x2C90719f25B10Fc5646c82DA3240C76Fa5BcCF34",
             "constantOutflowNFT": "0x554e2bbaCF43FD87417b7201A9F1649a3ED89d68",
             "constantInflowNFT": "0x55909bB8cd8276887Aae35118d60b19755201c68",
-            "superfluidLoader": "0x15F0Ca26781C3852f8166eD2ebce5D18265cceb7",
+            "superfluidLoader": "0xA3d2A6Db274722e802AC025d667041ecAb094FE7",
             "toga": "0x6AEAeE5Fd4D05A741723D752D30EE4D72690A8f7",
             "batchLiquidator": "0xA6Cdb472e7E22Bf30ae6fB752E4a13eBF3c12165",
             "flowScheduler": "0x55F7758dd99d5e185f4CC08d4Ad95B71f598264D",
diff --git a/packages/metadata/package.json b/packages/metadata/package.json
index 2d1655d6c8..9f38f431e0 100644
--- a/packages/metadata/package.json
+++ b/packages/metadata/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superfluid-finance/metadata",
-  "version": "1.1.20",
+  "version": "1.1.21",
   "description": "Superfluid Metadata",
   "main": "main/index.cjs",
   "module": "module/index.js",
diff --git a/packages/sdk-core/package.json b/packages/sdk-core/package.json
index 9576ddd0e7..8a90f956a1 100644
--- a/packages/sdk-core/package.json
+++ b/packages/sdk-core/package.json
@@ -57,7 +57,7 @@
     },
     "dependencies": {
         "@superfluid-finance/ethereum-contracts": "1.8.1",
-        "@superfluid-finance/metadata": "1.1.20",
+        "@superfluid-finance/metadata": "1.1.21",
         "browserify": "^17.0.0",
         "graphql-request": "^6.1.0",
         "lodash": "^4.17.21",
diff --git a/packages/subgraph/package.json b/packages/subgraph/package.json
index ed2192f2e7..fcd71006f4 100644
--- a/packages/subgraph/package.json
+++ b/packages/subgraph/package.json
@@ -55,7 +55,7 @@
         "mustache": "^4.2.0"
     },
     "devDependencies": {
-        "@superfluid-finance/metadata": "1.1.20",
+        "@superfluid-finance/metadata": "1.1.21",
         "coingecko-api": "^1.0.10",
         "graphql": "^16.8.0",
         "graphql-request": "^6.1.0",