diff --git a/beacon-chain/entrypoint.sh b/beacon-chain/entrypoint.sh
index 1a9ed1f..a166db4 100755
--- a/beacon-chain/entrypoint.sh
+++ b/beacon-chain/entrypoint.sh
@@ -23,6 +23,7 @@ FLAGS="--network=$NETWORK \
     --ee-endpoint=$ENGINE_URL \
     --ee-jwt-secret-file=$JWT_FILE_PATH \
     --p2p-port=$P2P_PORT \
+    --beacon-liveness-tracking-enabled=true \
     --rest-api-cors-origins=* \
     --rest-api-interface=0.0.0.0 \
     --rest-api-port=3500 \
diff --git a/validator/Dockerfile b/validator/Dockerfile
index 120f498..b382194 100644
--- a/validator/Dockerfile
+++ b/validator/Dockerfile
@@ -7,7 +7,8 @@ ARG STAKER_SCRIPTS_VERSION
 
 USER root 
 
-ENV TLS_CERT_PATH=/tls/cert
+# Modify TLS_CERT_PATH to include the NETWORK arg value
+ENV TLS_CERT_PATH=/tls/cert/${NETWORK}
 
 ENV DATA_DIR=/opt/teku/data \
     NETWORK=${NETWORK} \
@@ -18,7 +19,7 @@ ENV DATA_DIR=/opt/teku/data \
     STAKER_SCRIPTS_URL=https://github.com/dappnode/staker-package-scripts/releases/download/${STAKER_SCRIPTS_VERSION}
 
 COPY /security/validator-api-bearer ${VALIDATOR_API_TOKEN_PATH}
-COPY /security/cert ${TLS_CERT_PATH}
+COPY /security/cert/${NETWORK} ${TLS_CERT_PATH}
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 
 ADD ${STAKER_SCRIPTS_URL}/consensus_tools.sh /etc/profile.d/
@@ -31,3 +32,4 @@ RUN apt-get update && apt-get install ca-certificates --yes --no-install-recomme
 ENV NETWORK=${NETWORK}
 
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
+
diff --git a/validator/entrypoint.sh b/validator/entrypoint.sh
index 2f5d522..df8af4d 100755
--- a/validator/entrypoint.sh
+++ b/validator/entrypoint.sh
@@ -25,6 +25,7 @@ FLAGS="--log-destination=CONSOLE \
   --metrics-interface=0.0.0.0 \
   --metrics-port=8008 \
   --metrics-host-allowlist=* \
+  --doppelganger-detection-enabled=true \
   --validator-api-enabled=true \
   --validator-api-interface=0.0.0.0 \
   --validator-api-port=$VALIDATOR_PORT \
diff --git a/validator/security/cert/gnosis/teku_client_keystore.p12 b/validator/security/cert/gnosis/teku_client_keystore.p12
new file mode 100644
index 0000000..3538af0
Binary files /dev/null and b/validator/security/cert/gnosis/teku_client_keystore.p12 differ
diff --git a/validator/security/cert/teku_keystore_password.txt b/validator/security/cert/gnosis/teku_keystore_password.txt
similarity index 100%
rename from validator/security/cert/teku_keystore_password.txt
rename to validator/security/cert/gnosis/teku_keystore_password.txt
diff --git a/validator/security/cert/teku_client_keystore.p12 b/validator/security/cert/holesky/teku_client_keystore.p12
similarity index 100%
rename from validator/security/cert/teku_client_keystore.p12
rename to validator/security/cert/holesky/teku_client_keystore.p12
diff --git a/validator/security/cert/holesky/teku_keystore_password.txt b/validator/security/cert/holesky/teku_keystore_password.txt
new file mode 100644
index 0000000..a1a35a1
--- /dev/null
+++ b/validator/security/cert/holesky/teku_keystore_password.txt
@@ -0,0 +1 @@
+dappnode
\ No newline at end of file
diff --git a/validator/security/cert/lukso/teku_client_keystore.p12 b/validator/security/cert/lukso/teku_client_keystore.p12
new file mode 100644
index 0000000..3fe3693
Binary files /dev/null and b/validator/security/cert/lukso/teku_client_keystore.p12 differ
diff --git a/validator/security/cert/lukso/teku_keystore_password.txt b/validator/security/cert/lukso/teku_keystore_password.txt
new file mode 100644
index 0000000..a1a35a1
--- /dev/null
+++ b/validator/security/cert/lukso/teku_keystore_password.txt
@@ -0,0 +1 @@
+dappnode
\ No newline at end of file
diff --git a/validator/security/cert/mainnet/teku_client_keystore.p12 b/validator/security/cert/mainnet/teku_client_keystore.p12
new file mode 100644
index 0000000..a0d1777
Binary files /dev/null and b/validator/security/cert/mainnet/teku_client_keystore.p12 differ
diff --git a/validator/security/cert/mainnet/teku_keystore_password.txt b/validator/security/cert/mainnet/teku_keystore_password.txt
new file mode 100644
index 0000000..a1a35a1
--- /dev/null
+++ b/validator/security/cert/mainnet/teku_keystore_password.txt
@@ -0,0 +1 @@
+dappnode
\ No newline at end of file