diff --git a/ethd b/ethd
index f43eb88a..20536c93 100755
--- a/ethd
+++ b/ethd
@@ -2449,6 +2449,10 @@ version() {
             docompose exec execution erigon --version
             echo
             ;;&
+        *web3signer.yml* )
+            docompose exec web3signer /opt/web3signer/bin/web3signer --version
+            echo
+            ;;&
         *mev-boost.yml* )
             docompose exec mev-boost /app/mev-boost -version
             echo
diff --git a/teku/docker-entrypoint.sh b/teku/docker-entrypoint.sh
index 1d3f741c..96f15dd2 100755
--- a/teku/docker-entrypoint.sh
+++ b/teku/docker-entrypoint.sh
@@ -84,6 +84,15 @@ fi
 # Web3signer URL
 if [[ "${EMBEDDED_VC}" = "true" && "${WEB3SIGNER}" = "true" ]]; then
   __w3s_url="--validators-external-signer-url http://web3signer:9000 --validators-external-signer-public-keys external-signer"
+  while true; do
+    if curl -s -m 5 http://web3signer:9000 &> /dev/null; then
+        echo "web3signer is up, starting Teku"
+        break
+    else
+        echo "Waiting for web3signer to be reachable..."
+        sleep 5
+    fi
+  done
 else
   __w3s_url=""
 fi