--- a/.docker/forkless-config/launch-config-forkless-data.j2
+++ b/.docker/forkless-config/launch-config-forkless-data.j2
@@ -2,8 +2,8 @@
       "relaychain": {
         "bin": "/polkadot/target/release/polkadot",
         "upgradeBin": "/polkadot/target/release/polkadot",
-        "upgradeWasm": "/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm",
-        "chain": "westend-local",
+        "upgradeWasm": "/polkadot/target/release/wbuild/{{ RELAY_CHAIN_TYPE }}-runtime/{{ RELAY_CHAIN_TYPE }}_runtime.compact.compressed.wasm",
+        "chain": "{{ RELAY_CHAIN_TYPE }}-local",
         "nodes": [
             {
                 "name": "alice",
--- a/.docker/forkless-config/launch-config-forkless-nodata.j2
+++ b/.docker/forkless-config/launch-config-forkless-nodata.j2
@@ -2,8 +2,8 @@
       "relaychain": {
         "bin": "/polkadot/target/release/polkadot",
         "upgradeBin": "/polkadot/target/release/polkadot",
-        "upgradeWasm": "/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm",
-        "chain": "westend-local",
+        "upgradeWasm": "/polkadot/target/release/wbuild/{{ RELAY_CHAIN_TYPE }}-runtime/{{ RELAY_CHAIN_TYPE }}_runtime.compact.compressed.wasm",
+        "chain": "{{ RELAY_CHAIN_TYPE }}-local",
         "nodes": [
             {
                 "name": "alice",
--- a/.docker/xcm-config/launch-config-xcm-opal.j2
+++ b/.docker/xcm-config/launch-config-xcm-opal.j2
@@ -1,7 +1,7 @@
 {
     "relaychain": {
         "bin": "/polkadot/target/release/polkadot",
-        "chain": "{{ RELAY_CHAIN_TYPE }}",
+        "chain": "{{ RELAY_CHAIN_TYPE }}-local",
         "chainInitializer": [
                 "chainql",
                 "--tla-code=spec=import '${spec}'",
--- a/.docker/xcm-config/launch-config-xcm-quartz.j2
+++ b/.docker/xcm-config/launch-config-xcm-quartz.j2
@@ -1,7 +1,7 @@
 {
     "relaychain": {
         "bin": "/polkadot/target/release/polkadot",
-        "chain": "{{ RELAY_CHAIN_TYPE }}",
+        "chain": "{{ RELAY_CHAIN_TYPE }}-local",
         "chainInitializer": [
                 "chainql",
                 "--tla-code=spec=import '${spec}'",
--- a/.docker/xcm-config/launch-config-xcm-unique.j2
+++ b/.docker/xcm-config/launch-config-xcm-unique.j2
@@ -1,7 +1,7 @@
 {
     "relaychain": {
         "bin": "/polkadot/target/release/polkadot",
-        "chain": "{{ RELAY_CHAIN_TYPE }}",
+        "chain": "{{ RELAY_CHAIN_TYPE }}-local",
         "chainInitializer": [
                 "chainql",
                 "--tla-code=spec=import '${spec}'",
--- a/.env
+++ b/.env
@@ -1,7 +1,7 @@
 RUST_TOOLCHAIN=nightly-2022-11-15
 POLKADOT_BUILD_BRANCH=release-v0.9.36
 POLKADOT_LAUNCH_BRANCH=unique-network
-RELAY_CHAIN_TYPE=westend-local
+RELAY_CHAIN_TYPE=westend
 
 POLKADOT_MAINNET_BRANCH=release-v0.9.30
 STATEMINT_BUILD_BRANCH=release-parachains-v9320
--- a/.github/workflows/forkless-update-data.yml
+++ b/.github/workflows/forkless-update-data.yml
@@ -95,6 +95,7 @@
             NETWORK=${{ matrix.network }}
             REPLICA_FROM=${{ matrix.replica_from_address }}
             WASM_NAME=${{ matrix.wasm_name}}
+            RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }}
 
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-data.json
--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -95,6 +95,7 @@
           variables: |
             NETWORK=${{ matrix.network }}
             WASM_NAME=${{ matrix.wasm_name }}
+            RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }}
 
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-nodata.json
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -95,6 +95,7 @@
           output_file: .docker/launch-config-forkless-nodata.json
           variables: |
             NETWORK=${{ matrix.network }}
+            RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }}
 
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-nodata.json
--- a/.github/workflows/node-only-update.yml
+++ b/.github/workflows/node-only-update.yml
@@ -99,6 +99,7 @@
           variables: |
             NETWORK=${{ matrix.network }}
             WASM_NAME=${{ matrix.wasm_name }}
+            RELAY_CHAIN_TYPE=${{ env.RELAY_CHAIN_TYPE }}
 
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-nodata.json