diff --git a/integration-tests/bridges/README.md b/integration-tests/bridges/README.md
index b151205feb..3e499da7c8 100644
--- a/integration-tests/bridges/README.md
+++ b/integration-tests/bridges/README.md
@@ -25,9 +25,12 @@ To start a test, you need to:
 - build Substrate relay by running `cargo build -p substrate-relay --release` command in the
 [`parity-bridges-common`](https://github.com/paritytech/parity-bridges-common) repository clone. Copy the binary to `~/local_bridge_testing/bin/substrate-relay`. 
 - build chain spec generator:
+  - (you can use the current branch, or you can build generators from different branches, such as from specific tags or releases)
   - add the `sudo` pallet to the Polkadot and Kusama runtimes and give sudo rights to Alice, e.g. by running `git apply ./integration-tests/bridges/sudo-relay.patch` from the fellows root dir.
   - with this change build the chain spec generator by running `cargo build --release -p chain-spec-generator --features fast-runtime` 
-command. Copy the binary to `~/local_bridge_testing/bin/chain-spec-generator`.
+command.
+    - Copy the binary to `~/local_bridge_testing/bin/chain-spec-generator-kusama`.
+    - Copy the binary to `~/local_bridge_testing/bin/chain-spec-generator-polkadot`.
 - check/change the `POLKADOT_BINARY` and `POLKADOT_PARACHAIN_BINARY` paths (and ensure that the nearby variables
 have correct values) in the `./run-test.sh`.
 
diff --git a/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_kusama_local_network.toml b/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_kusama_local_network.toml
index 3cd10ade0c..fd0b90a565 100644
--- a/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_kusama_local_network.toml
+++ b/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_kusama_local_network.toml
@@ -5,7 +5,7 @@ node_spawn_timeout = 240
 default_command = "{{POLKADOT_BINARY}}"
 default_args = ["-lparachain=debug,xcm=trace"]
 chain = "kusama-local"
-chain_spec_command = "{{CHAIN_SPEC_GEN_BINARY}} {% raw %} {{chainName}} {% endraw %}"
+chain_spec_command = "{{CHAIN_SPEC_GEN_BINARY_FOR_KUSAMA}} {% raw %} {{chainName}} {% endraw %}"
 
 [[relaychain.nodes]]
 name = "alice"
@@ -31,7 +31,7 @@ balance = 2000000000000
 [[parachains]]
 id = 1000
 chain = "asset-hub-kusama-local"
-chain_spec_command = "{{CHAIN_SPEC_GEN_BINARY}} {% raw %} {{chainName}} {% endraw %}"
+chain_spec_command = "{{CHAIN_SPEC_GEN_BINARY_FOR_KUSAMA}} {% raw %} {{chainName}} {% endraw %}"
 cumulus_based = true
 
 [[parachains.collators]]
@@ -49,7 +49,7 @@ args = ["-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace"]
 [[parachains]]
 id = 1002
 chain = "bridge-hub-kusama-local"
-chain_spec_command = "{{ENV_PATH}}/generate_bh_spec.sh Polkadot {% raw %} {{chainName}} {% endraw %}"
+chain_spec_command = "{{ENV_PATH}}/generate_bhk_spec.sh Polkadot {% raw %} {{chainName}} {% endraw %}"
 cumulus_based = true
 
 # run alice as parachain collator
diff --git a/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_polkadot_local_network.toml b/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_polkadot_local_network.toml
index 75a0cb5f2b..2724921739 100644
--- a/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_polkadot_local_network.toml
+++ b/integration-tests/bridges/environments/polkadot-kusama/bridge_hub_polkadot_local_network.toml
@@ -5,7 +5,7 @@ node_spawn_timeout = 240
 default_command = "{{POLKADOT_BINARY}}"
 default_args = ["-lparachain=debug,xcm=trace"]
 chain = "polkadot-local"
-chain_spec_command = "{{CHAIN_SPEC_GEN_BINARY}} {% raw %} {{chainName}} {% endraw %}"
+chain_spec_command = "{{CHAIN_SPEC_GEN_BINARY_FOR_POLKADOT}} {% raw %} {{chainName}} {% endraw %}"
 
 [[relaychain.nodes]]
 name = "alice"
@@ -31,7 +31,7 @@ balance = 2000000000000
 [[parachains]]
 id = 1000
 chain = "asset-hub-polkadot-local"
-chain_spec_command = "{{CHAIN_SPEC_GEN_BINARY}} {% raw %} {{chainName}} {% endraw %}"
+chain_spec_command = "{{CHAIN_SPEC_GEN_BINARY_FOR_POLKADOT}} {% raw %} {{chainName}} {% endraw %}"
 cumulus_based = true
 
 [[parachains.collators]]
@@ -49,7 +49,7 @@ args = ["-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace"]
 [[parachains]]
 id = 1002
 chain = "bridge-hub-polkadot-local"
-chain_spec_command = "{{ENV_PATH}}/generate_bh_spec.sh Kusama {% raw %} {{chainName}} {% endraw %}"
+chain_spec_command = "{{ENV_PATH}}/generate_bhp_spec.sh Kusama {% raw %} {{chainName}} {% endraw %}"
 cumulus_based = true
 
 [[parachains.collators]]
diff --git a/integration-tests/bridges/environments/polkadot-kusama/generate_bh_spec.sh b/integration-tests/bridges/environments/polkadot-kusama/generate_bhk_spec.sh
similarity index 90%
rename from integration-tests/bridges/environments/polkadot-kusama/generate_bh_spec.sh
rename to integration-tests/bridges/environments/polkadot-kusama/generate_bhk_spec.sh
index b4fcbb8bae..33e54bbb57 100755
--- a/integration-tests/bridges/environments/polkadot-kusama/generate_bh_spec.sh
+++ b/integration-tests/bridges/environments/polkadot-kusama/generate_bhk_spec.sh
@@ -6,7 +6,7 @@ shift
 # Add Alice as bridge owner
 # We do this only if there is a `.genesis.runtimeGenesis.patch` object.
 # Otherwise we're working with the raw chain spec.
-$CHAIN_SPEC_GEN_BINARY "$@" \
+$CHAIN_SPEC_GEN_BINARY_FOR_KUSAMA "$@" \
   | jq 'if .genesis.runtimeGenesis.patch
     then .genesis.runtimeGenesis.patch.bridge'$bridged_chain'Grandpa.owner = "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY"
     else .
diff --git a/integration-tests/bridges/environments/polkadot-kusama/generate_bhp_spec.sh b/integration-tests/bridges/environments/polkadot-kusama/generate_bhp_spec.sh
new file mode 100755
index 0000000000..d1a2d43970
--- /dev/null
+++ b/integration-tests/bridges/environments/polkadot-kusama/generate_bhp_spec.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+bridged_chain=$1
+shift
+
+# Add Alice as bridge owner
+# We do this only if there is a `.genesis.runtimeGenesis.patch` object.
+# Otherwise we're working with the raw chain spec.
+$CHAIN_SPEC_GEN_BINARY_FOR_POLKADOT "$@" \
+  | jq 'if .genesis.runtimeGenesis.patch
+    then .genesis.runtimeGenesis.patch.bridge'$bridged_chain'Grandpa.owner = "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY"
+    else .
+    end'
diff --git a/integration-tests/bridges/run-test.sh b/integration-tests/bridges/run-test.sh
index 2321e16d40..3b03edd22a 100755
--- a/integration-tests/bridges/run-test.sh
+++ b/integration-tests/bridges/run-test.sh
@@ -34,7 +34,8 @@ echo
 export ZOMBIENET_BINARY=$LOCAL_BRIDGE_TESTING_PATH/bin/zombienet
 export POLKADOT_BINARY=$LOCAL_BRIDGE_TESTING_PATH/bin/polkadot
 export POLKADOT_PARACHAIN_BINARY=$LOCAL_BRIDGE_TESTING_PATH/bin/polkadot-parachain
-export CHAIN_SPEC_GEN_BINARY=$LOCAL_BRIDGE_TESTING_PATH/bin/chain-spec-generator
+export CHAIN_SPEC_GEN_BINARY_FOR_KUSAMA=$LOCAL_BRIDGE_TESTING_PATH/bin/chain-spec-generator-kusama
+export CHAIN_SPEC_GEN_BINARY_FOR_POLKADOT=$LOCAL_BRIDGE_TESTING_PATH/bin/chain-spec-generator-polkadot
 export SUBSTRATE_RELAY_BINARY=$LOCAL_BRIDGE_TESTING_PATH/bin/substrate-relay
 
 export TEST_DIR=`mktemp -d /tmp/bridges-tests-run-XXXXX`