--- a/.env
+++ b/.env
@@ -3,7 +3,7 @@
 POLKADOT_LAUNCH_BRANCH=unique-network
 RELAY_CHAIN_TYPE=westend
 
-POLKADOT_MAINNET_BRANCH=release-v0.9.34
+POLKADOT_MAINNET_BRANCH=release-v0.9.36
 STATEMINT_BUILD_BRANCH=release-parachains-v9360
 ACALA_BUILD_BRANCH=2.12.0
 MOONBEAM_BUILD_BRANCH=runtime-2000
@@ -13,15 +13,15 @@
 KUSAMA_MAINNET_BRANCH=release-v0.9.37
 STATEMINE_BUILD_BRANCH=release-parachains-v9360
 KARURA_BUILD_BRANCH=release-karura-2.12.0
-MOONRIVER_BUILD_BRANCH=runtime-2000
+MOONRIVER_BUILD_BRANCH=runtime-2100
 QUARTZ_MAINNET_BRANCH=release-v930034-fix-gas-price
 QUARTZ_REPLICA_FROM=wss://ws-quartz.unique.network:443
 
-UNIQUEWEST_MAINNET_BRANCH=release-v0.9.37
+UNIQUEWEST_MAINNET_BRANCH=release-v0.9.36
 WESTMINT_BUILD_BRANCH=parachains-v9370
-OPAL_MAINNET_BRANCH=release-v936050
+OPAL_MAINNET_BRANCH=release-v937052
 OPAL_REPLICA_FROM=wss://ws-opal.unique.network:443
 
 UNIQUEEAST_MAINNET_BRANCH=release-v0.9.32
-SAPPHIRE_MAINNET_BRANCH=release-v936040
+SAPPHIRE_MAINNET_BRANCH=release-v937052
 SAPPHIRE_REPLICA_FROM=wss://ws-sapphire.unique.network:443
--- a/tests/src/generateEnv.ts
+++ b/tests/src/generateEnv.ts
@@ -12,6 +12,7 @@
 function setVar(env: string, key: string, value: string): string {
   return env.replace(new RegExp(`${key}=.+?\n`), `${key}=${value}\n`);
 }
+
 // Fetch and format version string
 async function ff(url: string, regex: RegExp, rep: string): Promise<string> {
   const ver = await fetchVersion(url);
@@ -19,6 +20,13 @@
     throw new Error(`bad regex for ${url}`);
   return ver.replace(regex, rep);
 }
+function fixupUnique(version: string): string {
+  if (version === 'release-v930033')
+    return 'release-v930033-fix-gas-price';
+  if (version === 'release-v930034')
+    return 'release-v930034-fix-gas-price';
+  return version;
+}
 
 (async () => {
   let env = (await readFile(join(__dirname, '../../.env'))).toString();
@@ -27,20 +35,20 @@
     ff('wss://statemint-rpc.polkadot.io/', /^(....)$/, 'release-parachains-v$1').then(v => env = setVar(env, 'STATEMINT_BUILD_BRANCH', v)),
     ff('wss://acala-rpc-0.aca-api.network/', /^(.)(..)(.)$/, '$1.$2.$3').then(v => env = setVar(env, 'ACALA_BUILD_BRANCH', v)),
     ff('wss://wss.api.moonbeam.network/', /^(....)$/, 'runtime-$1').then(v => env = setVar(env, 'MOONBEAM_BUILD_BRANCH', v)),
-    ff('wss://ws.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'UNIQUE_MAINNET_BRANCH', v)),
+    ff('wss://ws.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'UNIQUE_MAINNET_BRANCH', fixupUnique(v))),
 
     ff('wss://kusama-rpc.polkadot.io/', /^(.)(..)(.)$/, 'release-v0.$1.$2').then(v => env = setVar(env, 'KUSAMA_MAINNET_BRANCH', v)),
     ff('wss://statemine-rpc.polkadot.io/', /^(....)$/, 'release-parachains-v$1').then(v => env = setVar(env, 'STATEMINE_BUILD_BRANCH', v)),
     ff('wss://karura-rpc-0.aca-api.network/', /^(.)(..)(.)$/, 'release-karura-$1.$2.$3').then(v => env = setVar(env, 'KARURA_BUILD_BRANCH', v)),
     ff('wss://wss.api.moonriver.moonbeam.network/', /^(....)$/, 'runtime-$1').then(v => env = setVar(env, 'MOONRIVER_BUILD_BRANCH', v)),
-    ff('wss://ws-quartz.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'QUARTZ_MAINNET_BRANCH', v)),
+    ff('wss://ws-quartz.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'QUARTZ_MAINNET_BRANCH', fixupUnique(v))),
 
     ff('wss://ws-westend.unique.network/', /^(.)(..)(.)$/, 'release-v0.$1.$2').then(v => env = setVar(env, 'UNIQUEWEST_MAINNET_BRANCH', v)),
     ff('wss://westmint-rpc.polkadot.io/', /^(....)$/, 'parachains-v$1').then(v => env = setVar(env, 'WESTMINT_BUILD_BRANCH', v)),
-    ff('wss://ws-opal.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'OPAL_MAINNET_BRANCH', v)),
+    ff('wss://ws-opal.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'OPAL_MAINNET_BRANCH', fixupUnique(v))),
 
     ff('wss://ws-eastend.unique.network/', /^(.)(..)(.)$/, 'release-v0.$1.$2').then(v => env = setVar(env, 'UNIQUEEAST_MAINNET_BRANCH', v)),
-    ff('wss://ws-sapphire.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'SAPPHIRE_MAINNET_BRANCH', v)),
+    ff('wss://ws-sapphire.unique.network/', /^(......)$/, 'release-v$1').then(v => env = setVar(env, 'SAPPHIRE_MAINNET_BRANCH', fixupUnique(v))),
   ]);
   console.log(env);
 })().catch(e => {