diff --git a/clients/nimbus-bn/Dockerfile b/clients/nimbus-bn/Dockerfile
index 8b69dec7ca..62974c0e11 100644
--- a/clients/nimbus-bn/Dockerfile
+++ b/clients/nimbus-bn/Dockerfile
@@ -11,10 +11,10 @@ ENV NPROC=2
 
 RUN git clone --depth 1 --branch unstable https://github.com/status-im/nimbus-eth2.git \
  && cd nimbus-eth2 \
- && make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC} -d:SECONDS_PER_SLOT=6" V=1 update
+ && make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" V=1 update
 
 RUN cd nimbus-eth2 && \
-    make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC} -d:SECONDS_PER_SLOT=6" nimbus_beacon_node && \
+    make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" nimbus_beacon_node && \
     mv build/nimbus_beacon_node /usr/bin/
 
 # --------------------------------- #
@@ -34,9 +34,10 @@ RUN usr/bin/nimbus_beacon_node --version > /version.txt
 
 ADD nimbus_bn.sh /nimbus_bn.sh
 RUN chmod +x /nimbus_bn.sh
+ADD nimbus_version.sh /nimbus_version.sh
+RUN chmod +x /nimbus_version.sh
 
-# TODO: output accurate client version
-RUN usr/bin/nimbus_beacon_node --version > /version.txt
+RUN /nimbus_version.sh > /version.txt
 
 EXPOSE 9000 9000/udp 4000 4000/udp
 
diff --git a/clients/nimbus-bn/nimbus_bn.sh b/clients/nimbus-bn/nimbus_bn.sh
index d9febfb9b1..28859249ac 100755
--- a/clients/nimbus-bn/nimbus_bn.sh
+++ b/clients/nimbus-bn/nimbus_bn.sh
@@ -19,19 +19,15 @@ cp /hive/input/config.yaml /data/testnet_setup
 # znrt encodes the values of these items between double quotes (""), which is against the spec:
 # https://github.com/ethereum/consensus-specs/blob/v1.1.10/configs/mainnet.yaml
 # Nimbus is the only client that complains about this.
-sed -i 's/TERMINAL_TOTAL_DIFFICULTY: "\([[:digit:]]\+\)"/TERMINAL_TOTAL_DIFFICULTY: \1/' /data/testnet_setup/config.yaml
-sed -i 's/TERMINAL_BLOCK_HASH: "\(0x[[:xdigit:]]\+\)"/TERMINAL_BLOCK_HASH: \1/' /data/testnet_setup/config.yaml
-sed -i 's/GENESIS_FORK_VERSION: "\(0x[[:xdigit:]]\+\)"/GENESIS_FORK_VERSION: \1/' /data/testnet_setup/config.yaml
-sed -i 's/ALTAIR_FORK_VERSION: "\(0x[[:xdigit:]]\+\)"/ALTAIR_FORK_VERSION: \1/' /data/testnet_setup/config.yaml
-sed -i 's/BELLATRIX_FORK_VERSION: "\(0x[[:xdigit:]]\+\)"/BELLATRIX_FORK_VERSION: \1/' /data/testnet_setup/config.yaml
-sed -i 's/CAPELLA_FORK_VERSION: "\(0x[[:xdigit:]]\+\)"/CAPELLA_FORK_VERSION: \1/' /data/testnet_setup/config.yaml
-sed -i 's/SHARDING_FORK_VERSION: "\(0x[[:xdigit:]]\+\)"/SHARDING_FORK_VERSION: \1/' /data/testnet_setup/config.yaml
+sed -i 's/"//g' /data/testnet_setup/config.yaml
+sed -i '/TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH/d' /data/testnet_setup/config.yaml
 echo Using config.yaml
 cat /data/testnet_setup/config.yaml
 echo ""
 
 echo "${HIVE_ETH2_CONFIG_DEPOSIT_CONTRACT_ADDRESS:-0x1111111111111111111111111111111111111111}" > /data/testnet_setup/deposit_contract.txt
-echo "${HIVE_ETH2_DEPOSIT_DEPLOY_BLOCK_NUMBER:-0}" > /data/testnet_setup/deploy_block.txt
+echo "${HIVE_ETH2_DEPOSIT_DEPLOY_BLOCK_NUMBER:-0}" > /data/testnet_setup/deposit_contract_block.txt
+echo "${HIVE_ETH2_DEPOSIT_DEPLOY_BLOCK_HASH:-0}" > /data/testnet_setup/deposit_contract_block_hash.txt
 
 mkdir -p /data/beacon
 chmod 0700 /data/beacon
diff --git a/clients/nimbus-bn/nimbus_version.sh b/clients/nimbus-bn/nimbus_version.sh
new file mode 100644
index 0000000000..42544889e0
--- /dev/null
+++ b/clients/nimbus-bn/nimbus_version.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Immediately abort the script on any error encountered
+set -e
+
+/usr/bin/nimbus_beacon_node --version | grep -Po ".*\bv?\d+\.\S+" | sed "s/ /_/g" | tr '\n' '/'
\ No newline at end of file
diff --git a/clients/nimbus-vc/Dockerfile b/clients/nimbus-vc/Dockerfile
index bfb6f35ffb..d174d5d788 100644
--- a/clients/nimbus-vc/Dockerfile
+++ b/clients/nimbus-vc/Dockerfile
@@ -11,10 +11,10 @@ ENV NPROC=2
 
 RUN git clone --depth 1 --branch unstable https://github.com/status-im/nimbus-eth2.git \
  && cd nimbus-eth2 \
- && make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC} -d:SECONDS_PER_SLOT=6" V=1 update
+ && make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" V=1 update
 
 RUN cd nimbus-eth2 && \
-    make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC} -d:SECONDS_PER_SLOT=6" nimbus_validator_client && \
+    make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" nimbus_validator_client && \
     mv build/nimbus_validator_client /usr/bin/
 
 # --------------------------------- #
@@ -30,10 +30,13 @@ RUN apt-get update \
 
 COPY --from=build /usr/bin/nimbus_validator_client /usr/bin/nimbus_validator_client
 
-RUN usr/bin/nimbus_validator_client --version > /version.txt
-
 # Add the startup script.
 ADD nimbus_vc.sh /nimbus_vc.sh
 RUN chmod +x /nimbus_vc.sh
 
+ADD nimbus_version.sh /nimbus_version.sh
+RUN chmod +x /nimbus_version.sh
+
+RUN /nimbus_version.sh > /version.txt
+
 ENTRYPOINT ["/nimbus_vc.sh"]
diff --git a/clients/nimbus-vc/nimbus_version.sh b/clients/nimbus-vc/nimbus_version.sh
new file mode 100644
index 0000000000..6ca299ee6d
--- /dev/null
+++ b/clients/nimbus-vc/nimbus_version.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Immediately abort the script on any error encountered
+set -e
+
+/usr/bin/nimbus_validator_client --version | grep -Po ".*\bv?\d+\.\S+" | sed "s/ /_/g" | tr '\n' '/'
\ No newline at end of file