diff --git a/packages/automation-contracts/autowrap/package.json b/packages/automation-contracts/autowrap/package.json
index d1199aa9ea..d2dab4d495 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.16"
+        "@superfluid-finance/metadata": "1.1.17"
     }
 }
diff --git a/packages/automation-contracts/scheduler/package.json b/packages/automation-contracts/scheduler/package.json
index 20afefb4b9..db1d54a2b7 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.16"
+        "@superfluid-finance/metadata": "1.1.17"
     }
 }
diff --git a/packages/ethereum-contracts/ops-scripts/resolver-list-super-token.js b/packages/ethereum-contracts/ops-scripts/resolver-list-super-token.js
index 0558add9d9..35a8a28e82 100644
--- a/packages/ethereum-contracts/ops-scripts/resolver-list-super-token.js
+++ b/packages/ethereum-contracts/ops-scripts/resolver-list-super-token.js
@@ -15,7 +15,8 @@ const {
  * @param {Address} options.from Address to deploy contracts from
  * @param {string} options.protocolReleaseVersion Specify the protocol release version to be used
  *
- * Usage: npx truffle exec ops-scripts/resolver-list-super-token.js : {SUPER_TOKEN_ADDRESS}
+ * Usage: npx truffle exec ops-scripts/resolver-list-super-token.js : {SUPER_TOKEN_ADDRESS} [SYMBOL]
+ *        If the optional argument SYMBOL is provided, it's used instead of the on-chain symbol.
  */
 module.exports = eval(`(${S.toString()})()`)(async function (
     args,
@@ -24,9 +25,16 @@ module.exports = eval(`(${S.toString()})()`)(async function (
     console.log("======== List new super token ========");
     let {resetToken, protocolReleaseVersion} = options;
 
-    if (args.length !== 1) {
+    if (args.length < 1 || args.length > 2) {
         throw new Error("Wrong number of arguments");
     }
+
+    let symbolOverride = undefined;
+    if (args.length === 2) {
+        symbolOverride = args.pop();
+        console.log("Symbol override", symbolOverride);
+    }
+
     const superTokenAddress = args.pop();
     console.log("Super Token Address", superTokenAddress);
 
@@ -58,7 +66,7 @@ module.exports = eval(`(${S.toString()})()`)(async function (
     ) {
         throw new Error("Not a super token");
     }
-    const tokenSymbol = await superToken.symbol.call();
+    const tokenSymbol = symbolOverride !== undefined ? symbolOverride : await superToken.symbol.call();
     const superTokenKey = `supertokens.${protocolReleaseVersion}.${tokenSymbol}`;
     console.log("Super token key", superTokenKey);
 
@@ -67,8 +75,9 @@ module.exports = eval(`(${S.toString()})()`)(async function (
         (await resolver.get.call(superTokenKey)) !== ZERO_ADDRESS &&
         !resetToken
     ) {
-        console.error("Super token already listed!");
+        console.error("### Super token already listed, you can force overwrite with reset flag!");
         console.error("A Transfer event may be needed for indexers to notice.");
+    } else {
+        await setResolver(sf, superTokenKey, superTokenAddress);
     }
-    await setResolver(sf, superTokenKey, superTokenAddress);
 });
diff --git a/packages/ethereum-contracts/package.json b/packages/ethereum-contracts/package.json
index 0c01f3eb8d..f9c5b0c155 100644
--- a/packages/ethereum-contracts/package.json
+++ b/packages/ethereum-contracts/package.json
@@ -89,7 +89,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.16",
+        "@superfluid-finance/metadata": "1.1.17",
         "async": "^3.2.4",
         "csv-writer": "^1.6.0",
         "ethers": "^5.7.2",
diff --git a/packages/ethereum-contracts/tasks/etherscan-verify-framework.sh b/packages/ethereum-contracts/tasks/etherscan-verify-framework.sh
index d34afe06fd..8aa01c2f84 100755
--- a/packages/ethereum-contracts/tasks/etherscan-verify-framework.sh
+++ b/packages/ethereum-contracts/tasks/etherscan-verify-framework.sh
@@ -77,6 +77,10 @@ if [ -n "$SUPERFLUID_GOVERNANCE" ]; then
     fi
 fi
 
+if [ -n "$SUPERFLUID_LOADER" ]; then
+    try_verify SuperfluidLoader@"${SUPERFLUID_LOADER}"
+fi
+
 if [ -n "$SUPERFLUID_SUPER_TOKEN_FACTORY_LOGIC" ]; then
     try_verify SuperTokenFactory@"${SUPERFLUID_SUPER_TOKEN_FACTORY_LOGIC}"
 fi
diff --git a/packages/js-sdk/package.json b/packages/js-sdk/package.json
index 8f73de4aff..4163284e82 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.16",
+        "@superfluid-finance/metadata": "1.1.17",
         "@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 49427e5daa..b6aa04fce1 100644
--- a/packages/metadata/CHANGELOG.md
+++ b/packages/metadata/CHANGELOG.md
@@ -3,6 +3,11 @@ 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.17]
+### Fixed
+- Removed `governance` from testnets, changes frequently and can't be reliably kept up to date here
+- Removed wrong contract entry for xdai-mainnet
+
 ## [v1.1.16]
 ### Fixed
 - Fixed `gdaV1` address for `avalanche-fuji`
diff --git a/packages/metadata/main/networks/list.cjs b/packages/metadata/main/networks/list.cjs
index 92cc4862e9..56085bf931 100644
--- a/packages/metadata/main/networks/list.cjs
+++ b/packages/metadata/main/networks/list.cjs
@@ -76,7 +76,6 @@ module.exports =
         "contractsV1": {
             "resolver": "0x8C54C83FbDe3C59e59dd6E324531FB93d4F504d3",
             "host": "0xEB796bdb90fFA0f28255275e16936D25d3418603",
-            "governance": "0x2637eA93EE5cd887ff9AC98185eA67Bd70C5f62e",
             "cfaV1": "0x49e565Ed1bdc17F3d220f72DF0857C26FA83F873",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x804348D4960a61f2d5F9ce9103027A3E849E09b8",
@@ -139,7 +138,6 @@ module.exports =
         "contractsV1": {
             "resolver": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136",
             "host": "0xE40983C2476032A0915600b9472B3141aA5B5Ba9",
-            "governance": "0x777Be25F9fdcA87e8a0E06Ad4be93d65429FCb9f",
             "cfaV1": "0xff48668fa670A85e55A7a822b352d5ccF3E7b18C",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x96215257F2FcbB00135578f766c0449d239bd92F",
@@ -181,7 +179,6 @@ module.exports =
         "contractsV1": {
             "resolver": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136",
             "host": "0xE40983C2476032A0915600b9472B3141aA5B5Ba9",
-            "governance": "0x777Be25F9fdcA87e8a0E06Ad4be93d65429FCb9f",
             "cfaV1": "0xff48668fa670A85e55A7a822b352d5ccF3E7b18C",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x96215257F2FcbB00135578f766c0449d239bd92F",
@@ -222,7 +219,6 @@ module.exports =
         "contractsV1": {
             "resolver": "0xf0ec6A8842Ca72Aec8A4D4573E731242389e18A8",
             "host": "0x85Fe79b998509B77BF10A8BD4001D58475D29386",
-            "governance": "0xA55632254Bc9F739bDe7191c8a4510aDdae3ef6D",
             "cfaV1": "0x16843ac25Ccc58Aa7960ba05f61cBB17b36b130A",
             "cfaV1Forwarder": "0x2CDd45c5182602a36d391F7F16DD9f8386C3bD8D",
             "idaV1": "0xA44dEC7A0Dde1a56AeDe4143C1ef89cf5d956782",
@@ -268,7 +264,6 @@ module.exports =
         "contractsV1": {
             "resolver": "0x6813edE4E78ecb830d380d0F7F684c12aAc95F02",
             "host": "0x109412E3C84f0539b43d39dB691B08c90f58dC7c",
-            "governance": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136",
             "cfaV1": "0x6836F23d6171D74Ef62FcF776655aBcD2bcd62Ef",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x9358C7dCCc6B8CA6F526311e8ac266F8C861B7ea",
@@ -304,7 +299,6 @@ module.exports =
         "contractsV1": {
             "resolver": "0x598D5dB9902cbBd6e8Ee9CDb3A231377cdA2f018",
             "host": "0x507c3a7C6Ccc253884A2e3a3ee2A211cC7E796a6",
-            "governance": "0xbe20Bac0DCF6f01834F51CCDab2dD72707C6e9b6",
             "cfaV1": "0x4C476F2Fb27272680F2f6f2592E94d9e704691bC",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0xaa4FCc799B8857FA87b2945Dc6572D5d76b35485",
@@ -343,7 +337,6 @@ module.exports =
         "contractsV1": {
             "resolver": "0x642332562BC60a4Bd9681E7bb1588f7456A497aC",
             "host": "0xe64f81d5dDdA1c7172e5C6d964E8ef1BD82D8704",
-            "governance": "0xF21019b8688e7730Ca6D9002569eCBaF8d1A3083",
             "cfaV1": "0x1EAa5ceA064aab2692AF257FB31f5291fdA3Cdee",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0xBf22019a4A4430bA67D3B0c8B4d5Edc48F913301",
@@ -393,7 +386,6 @@ module.exports =
             "flowScheduler": "0x9cC7fc484fF588926149577e9330fA5b2cA74336",
             "vestingScheduler": "0x0170FFCC75d178d426EBad5b1a31451d00Ddbd0D",
             "wrapManager": "0x7a2899D179a8F205C8EDAd2e52954cA5f6d48D1A",
-            "wrapStrategy": "0xc3B7f0b221a002fE8Fc93b4Ef9BB6362950510F2",
             "autowrap": {
                 "manager": "0x8082e58681350876aFe8f52d3Bf8672034A03Db0",
                 "wrapStrategy": "0x51FBAbD31A615E14b1bC12E9d887f60997264a4E"
diff --git a/packages/metadata/module/networks/list.js b/packages/metadata/module/networks/list.js
index 9887840550..6c13a229ed 100644
--- a/packages/metadata/module/networks/list.js
+++ b/packages/metadata/module/networks/list.js
@@ -76,7 +76,6 @@ export default
         "contractsV1": {
             "resolver": "0x8C54C83FbDe3C59e59dd6E324531FB93d4F504d3",
             "host": "0xEB796bdb90fFA0f28255275e16936D25d3418603",
-            "governance": "0x2637eA93EE5cd887ff9AC98185eA67Bd70C5f62e",
             "cfaV1": "0x49e565Ed1bdc17F3d220f72DF0857C26FA83F873",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x804348D4960a61f2d5F9ce9103027A3E849E09b8",
@@ -139,7 +138,6 @@ export default
         "contractsV1": {
             "resolver": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136",
             "host": "0xE40983C2476032A0915600b9472B3141aA5B5Ba9",
-            "governance": "0x777Be25F9fdcA87e8a0E06Ad4be93d65429FCb9f",
             "cfaV1": "0xff48668fa670A85e55A7a822b352d5ccF3E7b18C",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x96215257F2FcbB00135578f766c0449d239bd92F",
@@ -181,7 +179,6 @@ export default
         "contractsV1": {
             "resolver": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136",
             "host": "0xE40983C2476032A0915600b9472B3141aA5B5Ba9",
-            "governance": "0x777Be25F9fdcA87e8a0E06Ad4be93d65429FCb9f",
             "cfaV1": "0xff48668fa670A85e55A7a822b352d5ccF3E7b18C",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x96215257F2FcbB00135578f766c0449d239bd92F",
@@ -222,7 +219,6 @@ export default
         "contractsV1": {
             "resolver": "0xf0ec6A8842Ca72Aec8A4D4573E731242389e18A8",
             "host": "0x85Fe79b998509B77BF10A8BD4001D58475D29386",
-            "governance": "0xA55632254Bc9F739bDe7191c8a4510aDdae3ef6D",
             "cfaV1": "0x16843ac25Ccc58Aa7960ba05f61cBB17b36b130A",
             "cfaV1Forwarder": "0x2CDd45c5182602a36d391F7F16DD9f8386C3bD8D",
             "idaV1": "0xA44dEC7A0Dde1a56AeDe4143C1ef89cf5d956782",
@@ -268,7 +264,6 @@ export default
         "contractsV1": {
             "resolver": "0x6813edE4E78ecb830d380d0F7F684c12aAc95F02",
             "host": "0x109412E3C84f0539b43d39dB691B08c90f58dC7c",
-            "governance": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136",
             "cfaV1": "0x6836F23d6171D74Ef62FcF776655aBcD2bcd62Ef",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x9358C7dCCc6B8CA6F526311e8ac266F8C861B7ea",
@@ -304,7 +299,6 @@ export default
         "contractsV1": {
             "resolver": "0x598D5dB9902cbBd6e8Ee9CDb3A231377cdA2f018",
             "host": "0x507c3a7C6Ccc253884A2e3a3ee2A211cC7E796a6",
-            "governance": "0xbe20Bac0DCF6f01834F51CCDab2dD72707C6e9b6",
             "cfaV1": "0x4C476F2Fb27272680F2f6f2592E94d9e704691bC",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0xaa4FCc799B8857FA87b2945Dc6572D5d76b35485",
@@ -343,7 +337,6 @@ export default
         "contractsV1": {
             "resolver": "0x642332562BC60a4Bd9681E7bb1588f7456A497aC",
             "host": "0xe64f81d5dDdA1c7172e5C6d964E8ef1BD82D8704",
-            "governance": "0xF21019b8688e7730Ca6D9002569eCBaF8d1A3083",
             "cfaV1": "0x1EAa5ceA064aab2692AF257FB31f5291fdA3Cdee",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0xBf22019a4A4430bA67D3B0c8B4d5Edc48F913301",
@@ -393,7 +386,6 @@ export default
             "flowScheduler": "0x9cC7fc484fF588926149577e9330fA5b2cA74336",
             "vestingScheduler": "0x0170FFCC75d178d426EBad5b1a31451d00Ddbd0D",
             "wrapManager": "0x7a2899D179a8F205C8EDAd2e52954cA5f6d48D1A",
-            "wrapStrategy": "0xc3B7f0b221a002fE8Fc93b4Ef9BB6362950510F2",
             "autowrap": {
                 "manager": "0x8082e58681350876aFe8f52d3Bf8672034A03Db0",
                 "wrapStrategy": "0x51FBAbD31A615E14b1bC12E9d887f60997264a4E"
diff --git a/packages/metadata/networks.json b/packages/metadata/networks.json
index e8506cd164..ae9ca85216 100644
--- a/packages/metadata/networks.json
+++ b/packages/metadata/networks.json
@@ -74,7 +74,6 @@
         "contractsV1": {
             "resolver": "0x8C54C83FbDe3C59e59dd6E324531FB93d4F504d3",
             "host": "0xEB796bdb90fFA0f28255275e16936D25d3418603",
-            "governance": "0x2637eA93EE5cd887ff9AC98185eA67Bd70C5f62e",
             "cfaV1": "0x49e565Ed1bdc17F3d220f72DF0857C26FA83F873",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x804348D4960a61f2d5F9ce9103027A3E849E09b8",
@@ -137,7 +136,6 @@
         "contractsV1": {
             "resolver": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136",
             "host": "0xE40983C2476032A0915600b9472B3141aA5B5Ba9",
-            "governance": "0x777Be25F9fdcA87e8a0E06Ad4be93d65429FCb9f",
             "cfaV1": "0xff48668fa670A85e55A7a822b352d5ccF3E7b18C",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x96215257F2FcbB00135578f766c0449d239bd92F",
@@ -179,7 +177,6 @@
         "contractsV1": {
             "resolver": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136",
             "host": "0xE40983C2476032A0915600b9472B3141aA5B5Ba9",
-            "governance": "0x777Be25F9fdcA87e8a0E06Ad4be93d65429FCb9f",
             "cfaV1": "0xff48668fa670A85e55A7a822b352d5ccF3E7b18C",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x96215257F2FcbB00135578f766c0449d239bd92F",
@@ -220,7 +217,6 @@
         "contractsV1": {
             "resolver": "0xf0ec6A8842Ca72Aec8A4D4573E731242389e18A8",
             "host": "0x85Fe79b998509B77BF10A8BD4001D58475D29386",
-            "governance": "0xA55632254Bc9F739bDe7191c8a4510aDdae3ef6D",
             "cfaV1": "0x16843ac25Ccc58Aa7960ba05f61cBB17b36b130A",
             "cfaV1Forwarder": "0x2CDd45c5182602a36d391F7F16DD9f8386C3bD8D",
             "idaV1": "0xA44dEC7A0Dde1a56AeDe4143C1ef89cf5d956782",
@@ -266,7 +262,6 @@
         "contractsV1": {
             "resolver": "0x6813edE4E78ecb830d380d0F7F684c12aAc95F02",
             "host": "0x109412E3C84f0539b43d39dB691B08c90f58dC7c",
-            "governance": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136",
             "cfaV1": "0x6836F23d6171D74Ef62FcF776655aBcD2bcd62Ef",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x9358C7dCCc6B8CA6F526311e8ac266F8C861B7ea",
@@ -302,7 +297,6 @@
         "contractsV1": {
             "resolver": "0x598D5dB9902cbBd6e8Ee9CDb3A231377cdA2f018",
             "host": "0x507c3a7C6Ccc253884A2e3a3ee2A211cC7E796a6",
-            "governance": "0xbe20Bac0DCF6f01834F51CCDab2dD72707C6e9b6",
             "cfaV1": "0x4C476F2Fb27272680F2f6f2592E94d9e704691bC",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0xaa4FCc799B8857FA87b2945Dc6572D5d76b35485",
@@ -341,7 +335,6 @@
         "contractsV1": {
             "resolver": "0x642332562BC60a4Bd9681E7bb1588f7456A497aC",
             "host": "0xe64f81d5dDdA1c7172e5C6d964E8ef1BD82D8704",
-            "governance": "0xF21019b8688e7730Ca6D9002569eCBaF8d1A3083",
             "cfaV1": "0x1EAa5ceA064aab2692AF257FB31f5291fdA3Cdee",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0xBf22019a4A4430bA67D3B0c8B4d5Edc48F913301",
@@ -391,7 +384,6 @@
             "flowScheduler": "0x9cC7fc484fF588926149577e9330fA5b2cA74336",
             "vestingScheduler": "0x0170FFCC75d178d426EBad5b1a31451d00Ddbd0D",
             "wrapManager": "0x7a2899D179a8F205C8EDAd2e52954cA5f6d48D1A",
-            "wrapStrategy": "0xc3B7f0b221a002fE8Fc93b4Ef9BB6362950510F2",
             "autowrap": {
                 "manager": "0x8082e58681350876aFe8f52d3Bf8672034A03Db0",
                 "wrapStrategy": "0x51FBAbD31A615E14b1bC12E9d887f60997264a4E"
diff --git a/packages/metadata/package.json b/packages/metadata/package.json
index 2e3ce0d675..403de30760 100644
--- a/packages/metadata/package.json
+++ b/packages/metadata/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superfluid-finance/metadata",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "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 3e298f284d..e2c570143a 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.16",
+        "@superfluid-finance/metadata": "1.1.17",
         "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 d6b81e54fc..17f5b5fc0a 100644
--- a/packages/subgraph/package.json
+++ b/packages/subgraph/package.json
@@ -54,7 +54,7 @@
         "mustache": "^4.2.0"
     },
     "devDependencies": {
-        "@superfluid-finance/metadata": "1.1.16",
+        "@superfluid-finance/metadata": "1.1.17",
         "coingecko-api": "^1.0.10",
         "graphql": "^16.8.0",
         "graphql-request": "^6.1.0",