diff --git a/ethd b/ethd
index 8616c463..38ab9712 100755
--- a/ethd
+++ b/ethd
@@ -452,6 +452,7 @@ query_execution_client() {
       EXECUTION_CLIENT=$(whiptail --notags --title "Select execution client" --menu \
       "Which execution client do you want to run?  Choose Custom for 3rd parties like Infura" 9 60 2 \
       "NONE" "Custom" \
+      "nm.yml" "Nethermind (.NET)" \
       "geth.yml" "Geth (Go)" 3>&1 1>&2 2>&3)
     else
       EXECUTION_CLIENT=$(whiptail --notags --title "Select execution client" --menu \
diff --git a/lodestar-base.yml b/lodestar-base.yml
index 17eb547a..545f6e45 100644
--- a/lodestar-base.yml
+++ b/lodestar-base.yml
@@ -63,7 +63,7 @@ services:
     entrypoint:
       - node
       - --max-old-space-size=8192
-      - /usr/app/packages/cli/bin/lodestar
+      - /usr/app/node_modules/.bin/lodestar
       - validator
       - --rootDir
       - /var/lib/lodestar/validators
diff --git a/lodestar-validator.yml b/lodestar-validator.yml
index 9f988b04..d8047ebd 100644
--- a/lodestar-validator.yml
+++ b/lodestar-validator.yml
@@ -68,7 +68,7 @@ services:
     entrypoint:
       - node
       - --max-old-space-size=8192
-      - /usr/app/packages/cli/bin/lodestar
+      - /usr/app/node_modules/.bin/lodestar
       - account
       - validator
       - voluntary-exit