diff --git a/clients/lodestar-bn/Dockerfile b/clients/lodestar-bn/Dockerfile
new file mode 100644
index 0000000000..b3454d7481
--- /dev/null
+++ b/clients/lodestar-bn/Dockerfile
@@ -0,0 +1,10 @@
+ARG branch=next
+
+FROM chainsafe/lodestar:$branch
+
+ADD lodestar_bn.sh /lodestar_bn.sh
+RUN chmod +x /lodestar_bn.sh
+
+RUN node /usr/app/node_modules/.bin/lodestar --version | grep "Version:.*" | grep -o "v.*" > /version.txt
+
+ENTRYPOINT ["/lodestar_bn.sh"]
diff --git a/clients/lodestar-bn/hive.yaml b/clients/lodestar-bn/hive.yaml
new file mode 100644
index 0000000000..eeb8c815de
--- /dev/null
+++ b/clients/lodestar-bn/hive.yaml
@@ -0,0 +1,4 @@
+roles:
+  - beacon
+build_targets:
+  - mainnet
diff --git a/clients/lodestar-bn/lodestar_bn.sh b/clients/lodestar-bn/lodestar_bn.sh
new file mode 100755
index 0000000000..4af12997fd
--- /dev/null
+++ b/clients/lodestar-bn/lodestar_bn.sh
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# Immediately abort the script on any error encountered
+set -e
+
+if [ ! -f "/hive/input/genesis.ssz" ]; then
+    if [ -z "$HIVE_ETH2_ETH1_RPC_ADDRS" ]; then
+      echo "genesis.ssz file is missing, and no Eth1 RPC addr was provided for building genesis from scratch."
+      # TODO: alternative to start from weak-subjectivity-state
+      exit 1
+    fi
+fi
+
+mkdir -p /data/testnet_setup
+
+
+# empty bootnodes file, required for custom testnet setup, use CLI arg instead to configure it.
+
+echo "${HIVE_ETH2_CONFIG_DEPOSIT_CONTRACT_ADDRESS:-0x1111111111111111111111111111111111111111}" > /data/testnet_setup/deposit_contract.txt
+
+mkdir -p /data/beacon
+mkdir -p /data/network
+
+case "$HIVE_LOGLEVEL" in
+    0|1) LOG=error ;;
+    2)   LOG=warn  ;;
+    3)   LOG=info  ;;
+    4)   LOG=debug ;;
+    5)   LOG=silly ;;
+esac
+LOG=debug
+
+echo "bootnodes: ${HIVE_ETH2_BOOTNODE_ENRS}"
+
+CONTAINER_IP=`hostname -i | awk '{print $1;}'`
+echo Container IP: $CONTAINER_IP
+bootnodes_option=$([[ "$HIVE_ETH2_BOOTNODE_ENRS" == "" ]] && echo "" || echo "--network.discv5.bootEnrs ${HIVE_ETH2_BOOTNODE_ENRS//,/ }")
+metrics_option=$([[ "$HIVE_ETH2_METRICS_PORT" == "" ]] && echo "" || echo "--metrics.enabled --metrics.listenAddr=$CONTAINER_IP --metrics.port=$HIVE_ETH2_METRICS_PORT")
+opt_sync_option=$([[ "$HIVE_ETH2_SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY" == "" ]] && echo "" || echo "--safe-slots-to-import-optimistically=$HIVE_ETH2_SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY")
+
+echo "bootnodes option : ${bootnodes_option}"
+
+echo -n "0x7365637265747365637265747365637265747365637265747365637265747365" > /jwtsecret
+
+echo Starting Lodestar Beacon Node
+
+node /usr/app/node_modules/.bin/lodestar \
+    beacon \
+    --logLevel="$LOG" \
+    --rootDir=/data/beacon \
+    --port="${HIVE_ETH2_P2P_TCP_PORT:-9000}" \
+    --discoveryPort="${HIVE_ETH2_P2P_UDP_PORT:-9000}" \
+    --paramsFile=/hive/input/config.yaml \
+    --genesisStateFile=/hive/input/genesis.ssz \
+    --api.rest.enabled=true \
+    --api.rest.host=0.0.0.0 \
+    --api.rest.api="*" \
+    --api.rest.port="${HIVE_ETH2_BN_API_PORT:-4000}" \
+    --eth1.enabled=true \
+    --eth1.providerUrls="$HIVE_ETH2_ETH1_RPC_ADDRS" \
+    --execution.urls="$HIVE_ETH2_ETH1_ENGINE_RPC_ADDRS" \
+    --eth1.depositContractDeployBlock=${HIVE_ETH2_DEPOSIT_DEPLOY_BLOCK_NUMBER:-0} \
+    --jwt-secret=/jwtsecret \
+    $metrics_option \
+    $bootnodes_option \
+    $opt_sync_option \
+    --enr.ip="${CONTAINER_IP}" \
+    --enr.tcp="${HIVE_ETH2_P2P_TCP_PORT:-9000}" \
+    --enr.udp="${HIVE_ETH2_P2P_UDP_PORT:-9000}" \
+    --network.connectToDiscv5Bootnodes=true \
+    --network.discv5.enabled=true \
+    --network.subscribeAllSubnets=true \
+    --network.targetPeers="${HIVE_ETH2_P2P_TARGET_PEERS:-10}" \
+    --network.discv5FirstQueryDelayMs=5000
diff --git a/clients/lodestar-vc/Dockerfile b/clients/lodestar-vc/Dockerfile
new file mode 100644
index 0000000000..d5d832e80a
--- /dev/null
+++ b/clients/lodestar-vc/Dockerfile
@@ -0,0 +1,10 @@
+ARG branch=next
+
+FROM chainsafe/lodestar:$branch
+
+ADD lodestar_vc.sh /lodestar_vc.sh
+RUN chmod +x /lodestar_vc.sh
+
+RUN node /usr/app/node_modules/.bin/lodestar --version | grep "Version:.*" | grep -o "v.*" > /version.txt
+
+ENTRYPOINT ["/lodestar_vc.sh"]
diff --git a/clients/lodestar-vc/hive.yaml b/clients/lodestar-vc/hive.yaml
new file mode 100644
index 0000000000..7c4f4f770b
--- /dev/null
+++ b/clients/lodestar-vc/hive.yaml
@@ -0,0 +1,2 @@
+roles:
+  - validator
diff --git a/clients/lodestar-vc/lodestar_vc.sh b/clients/lodestar-vc/lodestar_vc.sh
new file mode 100755
index 0000000000..ed872de4fb
--- /dev/null
+++ b/clients/lodestar-vc/lodestar_vc.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# Immediately abort the script on any error encountered
+set -e
+
+mkdir -p /data/testnet_setup
+mkdir -p /data/vc
+mkdir -p /data/validators
+mkdir -p /data/secrets
+
+cp /hive/input/config.yaml /data/testnet_setup
+
+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
+
+for keystore_path in /hive/input/keystores/*
+do
+  pubkey=$(basename "$keystore_path")
+  mkdir "/data/validators/$pubkey"
+  cp "/hive/input/keystores/$pubkey/keystore.json" "/data/validators/$pubkey/voting-keystore.json"
+  cp "/hive/input/secrets/$pubkey" "/data/secrets/$pubkey"
+done
+
+metrics_option=$([[ "$HIVE_ETH2_METRICS_PORT" == "" ]] && echo "" || echo "--metrics.enabled --metrics.address=$CONTAINER_IP --metrics.port=$HIVE_ETH2_METRICS_PORT")
+
+LOG=info
+case "$HIVE_LOGLEVEL" in
+    0|1) LOG=error ;;
+    2)   LOG=warn  ;;
+    3)   LOG=info  ;;
+    4)   LOG=debug ;;
+    5)   LOG=silly ;;
+esac
+
+echo Starting Lodestar Validator Client
+
+node /usr/app/node_modules/.bin/lodestar \
+    validator \
+    --logLevel="$LOG" \
+    --rootDir=/data/vc \
+    --paramsFile=/hive/input/config.yaml \
+    --keystoresDir="/data/validators" \
+    --secretsDir="/data/secrets" \
+    $metrics_option \
+    --server="http://$HIVE_ETH2_BN_API_IP:$HIVE_ETH2_BN_API_PORT"
+