diff --git a/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc-grpc.sh.j2 b/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc-grpc.sh.j2
index 35a21c07..162b9893 100644
--- a/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc-grpc.sh.j2
+++ b/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc-grpc.sh.j2
@@ -15,7 +15,7 @@ exec agave-validator \
 --known-validator GdnSyH3YtwcxFvQrVVJMm1JhTS4QVX7MFsX56uJLUfiZ \
 --known-validator CakcnaRDHka2gXyfbEd2d3xsvkJkqsLw2akB3zsN1D2S \
 --expected-genesis-hash 5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d \
---expected-shred-version 50093 \
+--expected-shred-version {{ expected_shred_version | default("50093") }} \
 --only-known-rpc \
 --no-voting \
 --private-rpc \
diff --git a/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc-index.sh.j2 b/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc-index.sh.j2
index 90357725..a15176e9 100644
--- a/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc-index.sh.j2
+++ b/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc-index.sh.j2
@@ -15,7 +15,7 @@ exec agave-validator \
 --known-validator GdnSyH3YtwcxFvQrVVJMm1JhTS4QVX7MFsX56uJLUfiZ \
 --known-validator CakcnaRDHka2gXyfbEd2d3xsvkJkqsLw2akB3zsN1D2S \
 --expected-genesis-hash 5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d \
---expected-shred-version 50093 \
+--expected-shred-version {{ expected_shred_version | default("50093") }} \
 --only-known-rpc \
 --full-rpc-api \
 --no-voting \
diff --git a/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc-tx.sh.j2 b/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc-tx.sh.j2
index 54a53fb2..73eaba25 100644
--- a/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc-tx.sh.j2
+++ b/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc-tx.sh.j2
@@ -15,7 +15,7 @@ exec agave-validator \
 --known-validator GdnSyH3YtwcxFvQrVVJMm1JhTS4QVX7MFsX56uJLUfiZ \
 --known-validator CakcnaRDHka2gXyfbEd2d3xsvkJkqsLw2akB3zsN1D2S \
 --expected-genesis-hash 5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d \
---expected-shred-version 50093 \
+--expected-shred-version {{ expected_shred_version | default("50093") }} \
 --only-known-rpc \
 --full-rpc-api \
 --no-voting \
diff --git a/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc.sh.j2 b/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc.sh.j2
index 63f4c8f1..33780d8c 100644
--- a/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc.sh.j2
+++ b/template/2026.6.6.1502/jinja/mainnet-rpc/start-mainnet-rpc.sh.j2
@@ -15,7 +15,7 @@ exec agave-validator \
 --known-validator GdnSyH3YtwcxFvQrVVJMm1JhTS4QVX7MFsX56uJLUfiZ \
 --known-validator CakcnaRDHka2gXyfbEd2d3xsvkJkqsLw2akB3zsN1D2S \
 --expected-genesis-hash 5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d \
---expected-shred-version 50093 \
+--expected-shred-version {{ expected_shred_version | default("50093") }} \
 --only-known-rpc \
 --full-rpc-api \
 --no-voting \
diff --git a/template/2026.6.6.1502/jinja/mainnet-rpc/start-validator.sh.j2 b/template/2026.6.6.1502/jinja/mainnet-rpc/start-validator.sh.j2
index c3361df3..dc58e224 100644
--- a/template/2026.6.6.1502/jinja/mainnet-rpc/start-validator.sh.j2
+++ b/template/2026.6.6.1502/jinja/mainnet-rpc/start-validator.sh.j2
@@ -16,7 +16,7 @@ exec agave-validator \
 --known-validator CakcnaRDHka2gXyfbEd2d3xsvkJkqsLw2akB3zsN1D2S \
 --only-known-rpc \
 --expected-genesis-hash 5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d \
---expected-shred-version 50093 \
+--expected-shred-version {{ expected_shred_version | default("50093") }} \
 --dynamic-port-range {{ dynamic_port_range | default("8900-8930") }}  \
 --no-voting \
 --rpc-port {{ port_rpc | default(8899, true) }} \
diff --git a/template/2026.6.6.1502/jinja/mainnet-validator/start-validator.sh.j2 b/template/2026.6.6.1502/jinja/mainnet-validator/start-validator.sh.j2
index 3c04e007..fb4e319c 100644
--- a/template/2026.6.6.1502/jinja/mainnet-validator/start-validator.sh.j2
+++ b/template/2026.6.6.1502/jinja/mainnet-validator/start-validator.sh.j2
@@ -17,7 +17,7 @@ exec agave-validator \
 --known-validator CakcnaRDHka2gXyfbEd2d3xsvkJkqsLw2akB3zsN1D2S \
 --only-known-rpc \
 --expected-genesis-hash 5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d \
---expected-shred-version 50093 \
+--expected-shred-version {{ expected_shred_version | default("50093") }} \
 --dynamic-port-range {{ dynamic_port_range | default("8000-8030") }} \
 --rpc-port {{ port_rpc | default(8899, true) }} \
 --wal-recovery-mode skip_any_corrupted_record \
diff --git a/template/2026.6.6.1502/jinja/testnet-rpc/start-validator.sh.j2 b/template/2026.6.6.1502/jinja/testnet-rpc/start-validator.sh.j2
index e02691e2..5bb83e49 100644
--- a/template/2026.6.6.1502/jinja/testnet-rpc/start-validator.sh.j2
+++ b/template/2026.6.6.1502/jinja/testnet-rpc/start-validator.sh.j2
@@ -20,8 +20,10 @@ exec agave-validator \
 --full-rpc-api \
 --rpc-port {{ port_rpc | default(8899, true) }} \
 --wal-recovery-mode skip_any_corrupted_record \
---expected-shred-version 57087 \
---expected-bank-hash YFxSkDcvSPiA7EQpSTbCsWbJvNYMAsWXGvwGc3bXHEA \
+--expected-shred-version {{ expected_shred_version | default("57087") }} \
+{% if expected_bank_hash is defined and expected_bank_hash %}
+--expected-bank-hash {{ expected_bank_hash }} \
+{% endif %}
 {% if rpc_type == 'Geyser gRPC' -%}
 --limit-ledger-size 50000000 \
 --no-snapshot-fetch \
diff --git a/template/2026.6.6.1502/jinja/testnet-validator/start-validator-agave.sh.j2 b/template/2026.6.6.1502/jinja/testnet-validator/start-validator-agave.sh.j2
index f4cae196..de634f0e 100644
--- a/template/2026.6.6.1502/jinja/testnet-validator/start-validator-agave.sh.j2
+++ b/template/2026.6.6.1502/jinja/testnet-validator/start-validator-agave.sh.j2
@@ -14,11 +14,11 @@ exec agave-validator \
 --dynamic-port-range {{ dynamic_port_range | default("8000-8030") }} \
 --rpc-port {{ port_rpc | default(8899, true) }} \
 --wal-recovery-mode skip_any_corrupted_record \
-{% if wait_for_supermajority is defined %}
+{% if wait_for_supermajority is defined and wait_for_supermajority %}
 --wait-for-supermajority {{ wait_for_supermajority }} \
 {% endif %}
 --expected-shred-version {{ expected_shred_version | default("57087") }} \
-{% if expected_bank_hash is defined %}
+{% if expected_bank_hash is defined and expected_bank_hash %}
 --expected-bank-hash {{ expected_bank_hash }} \
 {% endif %}
 --limit-ledger-size {{ limit_ledger_size | default(200000000) }} \
diff --git a/template/2026.6.6.1502/jinja/testnet-validator/start-validator-jito.sh.j2 b/template/2026.6.6.1502/jinja/testnet-validator/start-validator-jito.sh.j2
index 0ff3aa21..0b786266 100644
--- a/template/2026.6.6.1502/jinja/testnet-validator/start-validator-jito.sh.j2
+++ b/template/2026.6.6.1502/jinja/testnet-validator/start-validator-jito.sh.j2
@@ -14,11 +14,11 @@ exec agave-validator \
 --dynamic-port-range {{ dynamic_port_range | default("8000-8030") }} \
 --rpc-port {{ port_rpc | default(8899, true) }} \
 --wal-recovery-mode skip_any_corrupted_record \
-{% if wait_for_supermajority is defined %}
+{% if wait_for_supermajority is defined and wait_for_supermajority %}
 --wait-for-supermajority {{ wait_for_supermajority }} \
 {% endif %}
 --expected-shred-version {{ expected_shred_version | default("57087") }} \
-{% if expected_bank_hash is defined %}
+{% if expected_bank_hash is defined and expected_bank_hash %}
 --expected-bank-hash {{ expected_bank_hash }} \
 {% endif %}
 --limit-ledger-size {{ limit_ledger_size | default(200000000) }} \
diff --git a/template/2026.6.6.1502/jinja/testnet-validator/start-validator.sh.j2 b/template/2026.6.6.1502/jinja/testnet-validator/start-validator.sh.j2
index 3a900c91..1fd10e6b 100644
--- a/template/2026.6.6.1502/jinja/testnet-validator/start-validator.sh.j2
+++ b/template/2026.6.6.1502/jinja/testnet-validator/start-validator.sh.j2
@@ -12,11 +12,11 @@ exec agave-validator \
 --dynamic-port-range {{ dynamic_port_range | default("8000-8030") }} \
 --rpc-port {{ port_rpc | default(8899, true) }} \
 --wal-recovery-mode skip_any_corrupted_record \
-{% if wait_for_supermajority is defined %}
+{% if wait_for_supermajority is defined and wait_for_supermajority %}
 --wait-for-supermajority {{ wait_for_supermajority }} \
 {% endif %}
 --expected-shred-version {{ expected_shred_version | default(57087) }} \
-{% if expected_bank_hash is defined %}
+{% if expected_bank_hash is defined and expected_bank_hash %}
 --expected-bank-hash {{ expected_bank_hash }} \
 {% endif %}
 --limit-ledger-size {{ limit_ledger_size | default(200000000) }} \