diff --git a/cli/actions/testdata/getContainers_tests/case_consensusNF/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_consensusNF/docker-compose.yml
index 51df73989..ac56f7e60 100644
--- a/cli/actions/testdata/getContainers_tests/case_consensusNF/docker-compose.yml
+++ b/cli/actions/testdata/getContainers_tests/case_consensusNF/docker-compose.yml
@@ -82,7 +82,6 @@ services:
       - --http-address=0.0.0.0
       - --http-port=4000
       - --network=${NETWORK}
-      - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
       - --eth1
diff --git a/cli/actions/testdata/getContainers_tests/case_consensusOnly/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_consensusOnly/docker-compose.yml
index 99e618c7c..40f670d56 100644
--- a/cli/actions/testdata/getContainers_tests/case_consensusOnly/docker-compose.yml
+++ b/cli/actions/testdata/getContainers_tests/case_consensusOnly/docker-compose.yml
@@ -29,7 +29,6 @@ services:
       - --http-address=0.0.0.0
       - --http-port=4000
       - --network=${NETWORK}
-      - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
       - --eth1
diff --git a/cli/actions/testdata/getContainers_tests/case_executionNF/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_executionNF/docker-compose.yml
index 6f699fe25..3ada19120 100644
--- a/cli/actions/testdata/getContainers_tests/case_executionNF/docker-compose.yml
+++ b/cli/actions/testdata/getContainers_tests/case_executionNF/docker-compose.yml
@@ -82,7 +82,6 @@ services:
       - --http-address=0.0.0.0
       - --http-port=4000
       - --network=${NETWORK}
-      - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
       - --eth1
diff --git a/cli/actions/testdata/getContainers_tests/case_fullNode/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_fullNode/docker-compose.yml
index 9d9c127bc..6d941aeaf 100644
--- a/cli/actions/testdata/getContainers_tests/case_fullNode/docker-compose.yml
+++ b/cli/actions/testdata/getContainers_tests/case_fullNode/docker-compose.yml
@@ -82,7 +82,6 @@ services:
     - --http-address=0.0.0.0
     - --http-port=4000
     - --network=${NETWORK}
-    - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
     - --eth1
diff --git a/cli/actions/testdata/getContainers_tests/case_fullNodeTag/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_fullNodeTag/docker-compose.yml
index 8632b4b54..c69bfdff3 100644
--- a/cli/actions/testdata/getContainers_tests/case_fullNodeTag/docker-compose.yml
+++ b/cli/actions/testdata/getContainers_tests/case_fullNodeTag/docker-compose.yml
@@ -83,7 +83,6 @@ services:
     - --http-address=0.0.0.0
     - --http-port=4000
     - --network=${NETWORK}
-    - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
     - --eth1
diff --git a/cli/actions/testdata/getContainers_tests/case_noExecution/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_noExecution/docker-compose.yml
index a33b9a9ba..9bf66d4de 100644
--- a/cli/actions/testdata/getContainers_tests/case_noExecution/docker-compose.yml
+++ b/cli/actions/testdata/getContainers_tests/case_noExecution/docker-compose.yml
@@ -44,7 +44,6 @@ services:
       - --http-address=0.0.0.0
       - --http-port=4000
       - --network=${NETWORK}
-      - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
       - --eth1
diff --git a/cli/actions/testdata/getContainers_tests/case_noMev/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_noMev/docker-compose.yml
index 98debf6ef..043333209 100644
--- a/cli/actions/testdata/getContainers_tests/case_noMev/docker-compose.yml
+++ b/cli/actions/testdata/getContainers_tests/case_noMev/docker-compose.yml
@@ -68,7 +68,6 @@ services:
       - --http-address=0.0.0.0
       - --http-port=4000
       - --network=${NETWORK}
-      - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
       - --eth1
diff --git a/cli/actions/testdata/getContainers_tests/case_noValidator/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_noValidator/docker-compose.yml
index f06ba0ab1..a2da0cc7b 100644
--- a/cli/actions/testdata/getContainers_tests/case_noValidator/docker-compose.yml
+++ b/cli/actions/testdata/getContainers_tests/case_noValidator/docker-compose.yml
@@ -82,7 +82,6 @@ services:
       - --http-address=0.0.0.0
       - --http-port=4000
       - --network=${NETWORK}
-      - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
       - --eth1
diff --git a/cli/actions/testdata/getContainers_tests/case_validatorNF/docker-compose.yml b/cli/actions/testdata/getContainers_tests/case_validatorNF/docker-compose.yml
index 72761b190..2d25dc82b 100644
--- a/cli/actions/testdata/getContainers_tests/case_validatorNF/docker-compose.yml
+++ b/cli/actions/testdata/getContainers_tests/case_validatorNF/docker-compose.yml
@@ -82,7 +82,6 @@ services:
       - --http-address=0.0.0.0
       - --http-port=4000
       - --network=${NETWORK}
-      - --target-peers=${CC_PEER_COUNT}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
       - --eth1
diff --git a/cli/testdata/down_tests/case_1/sedge-data/.env b/cli/testdata/down_tests/case_1/sedge-data/.env
index 7879f0553..7903f2514 100644
--- a/cli/testdata/down_tests/case_1/sedge-data/.env
+++ b/cli/testdata/down_tests/case_1/sedge-data/.env
@@ -14,7 +14,6 @@ NETHERMIND_ETHSTATSCONFIG_NAME=Nethermind
 NETHERMIND_ETHSTATSCONFIG_SECRET=secret
 NETHERMIND_ETHSTATSCONFIG_CONTACT=hello@nethermind.io
 EC_DATA_DIR=./execution-data
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 NETWORK=mainnet
 EC_NODE=http://localhost:8545
diff --git a/cli/testdata/down_tests/case_1/sedge-data/docker-compose.yml b/cli/testdata/down_tests/case_1/sedge-data/docker-compose.yml
index d337595c7..1d73043fd 100644
--- a/cli/testdata/down_tests/case_1/sedge-data/docker-compose.yml
+++ b/cli/testdata/down_tests/case_1/sedge-data/docker-compose.yml
@@ -61,7 +61,6 @@ services:
       - --logging=${CC_LOG_LEVEL}
       - --network=${NETWORK}
       - --p2p-port=9000
-      - --p2p-peer-upper-bound=${CC_PEER_COUNT}
       - --rest-api-host-allowlist=*
       - --rest-api-enabled=true
       - --rest-api-port=4000
diff --git a/cli/testdata/logs_tests/case_1/sedge-data/.env b/cli/testdata/logs_tests/case_1/sedge-data/.env
index 7879f0553..7903f2514 100644
--- a/cli/testdata/logs_tests/case_1/sedge-data/.env
+++ b/cli/testdata/logs_tests/case_1/sedge-data/.env
@@ -14,7 +14,6 @@ NETHERMIND_ETHSTATSCONFIG_NAME=Nethermind
 NETHERMIND_ETHSTATSCONFIG_SECRET=secret
 NETHERMIND_ETHSTATSCONFIG_CONTACT=hello@nethermind.io
 EC_DATA_DIR=./execution-data
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 NETWORK=mainnet
 EC_NODE=http://localhost:8545
diff --git a/cli/testdata/logs_tests/case_1/sedge-data/docker-compose.yml b/cli/testdata/logs_tests/case_1/sedge-data/docker-compose.yml
index d337595c7..1d73043fd 100644
--- a/cli/testdata/logs_tests/case_1/sedge-data/docker-compose.yml
+++ b/cli/testdata/logs_tests/case_1/sedge-data/docker-compose.yml
@@ -61,7 +61,6 @@ services:
       - --logging=${CC_LOG_LEVEL}
       - --network=${NETWORK}
       - --p2p-port=9000
-      - --p2p-peer-upper-bound=${CC_PEER_COUNT}
       - --rest-api-host-allowlist=*
       - --rest-api-enabled=true
       - --rest-api-port=4000
diff --git a/cli/testdata/run_tests/no_env/docker-compose.yml b/cli/testdata/run_tests/no_env/docker-compose.yml
index 41a203c61..08a694214 100644
--- a/cli/testdata/run_tests/no_env/docker-compose.yml
+++ b/cli/testdata/run_tests/no_env/docker-compose.yml
@@ -85,7 +85,6 @@ services:
     - --http-address=0.0.0.0
     - --http-port=4000
     - --network=${NETWORK}
-    - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
     - --eth1
diff --git a/cli/testdata/run_tests/no_services/.env b/cli/testdata/run_tests/no_services/.env
index 8b6e44601..7d2b7688a 100644
--- a/cli/testdata/run_tests/no_services/.env
+++ b/cli/testdata/run_tests/no_services/.env
@@ -10,7 +10,6 @@ EC_DATA_DIR=./execution-data
 EC_SNAP_SYNC_ENABLED=true
 EC_JWT_SECRET_PATH=/Users/teno/go/src/github.com/NethermindEth/1Click/sedge-data/jwtsecret
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL=http://execution:8545
 EC_AUTH_URL=http://execution:8551
diff --git a/cli/testdata/run_tests/no_version/.env b/cli/testdata/run_tests/no_version/.env
index 8b6e44601..7d2b7688a 100644
--- a/cli/testdata/run_tests/no_version/.env
+++ b/cli/testdata/run_tests/no_version/.env
@@ -10,7 +10,6 @@ EC_DATA_DIR=./execution-data
 EC_SNAP_SYNC_ENABLED=true
 EC_JWT_SECRET_PATH=/Users/teno/go/src/github.com/NethermindEth/1Click/sedge-data/jwtsecret
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL=http://execution:8545
 EC_AUTH_URL=http://execution:8551
diff --git a/cli/testdata/run_tests/no_version/docker-compose.yml b/cli/testdata/run_tests/no_version/docker-compose.yml
index a23d4e0d3..01cd34913 100644
--- a/cli/testdata/run_tests/no_version/docker-compose.yml
+++ b/cli/testdata/run_tests/no_version/docker-compose.yml
@@ -84,7 +84,6 @@ services:
     - --http-address=0.0.0.0
     - --http-port=4000
     - --network=${NETWORK}
-    - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
     - --eth1
diff --git a/cli/testdata/run_tests/valid/.env b/cli/testdata/run_tests/valid/.env
index 8b6e44601..7d2b7688a 100644
--- a/cli/testdata/run_tests/valid/.env
+++ b/cli/testdata/run_tests/valid/.env
@@ -10,7 +10,6 @@ EC_DATA_DIR=./execution-data
 EC_SNAP_SYNC_ENABLED=true
 EC_JWT_SECRET_PATH=/Users/teno/go/src/github.com/NethermindEth/1Click/sedge-data/jwtsecret
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL=http://execution:8545
 EC_AUTH_URL=http://execution:8551
diff --git a/cli/testdata/run_tests/valid/docker-compose.yml b/cli/testdata/run_tests/valid/docker-compose.yml
index a23d4e0d3..01cd34913 100644
--- a/cli/testdata/run_tests/valid/docker-compose.yml
+++ b/cli/testdata/run_tests/valid/docker-compose.yml
@@ -84,7 +84,6 @@ services:
     - --http-address=0.0.0.0
     - --http-port=4000
     - --network=${NETWORK}
-    - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
     - --eth1
diff --git a/internal/utils/testdata/checks_tests/case_1/sedge-data/.env b/internal/utils/testdata/checks_tests/case_1/sedge-data/.env
index 7879f0553..7903f2514 100644
--- a/internal/utils/testdata/checks_tests/case_1/sedge-data/.env
+++ b/internal/utils/testdata/checks_tests/case_1/sedge-data/.env
@@ -14,7 +14,6 @@ NETHERMIND_ETHSTATSCONFIG_NAME=Nethermind
 NETHERMIND_ETHSTATSCONFIG_SECRET=secret
 NETHERMIND_ETHSTATSCONFIG_CONTACT=hello@nethermind.io
 EC_DATA_DIR=./execution-data
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 NETWORK=mainnet
 EC_NODE=http://localhost:8545
diff --git a/internal/utils/testdata/checks_tests/case_1/sedge-data/docker-compose.yml b/internal/utils/testdata/checks_tests/case_1/sedge-data/docker-compose.yml
index d337595c7..1d73043fd 100644
--- a/internal/utils/testdata/checks_tests/case_1/sedge-data/docker-compose.yml
+++ b/internal/utils/testdata/checks_tests/case_1/sedge-data/docker-compose.yml
@@ -61,7 +61,6 @@ services:
       - --logging=${CC_LOG_LEVEL}
       - --network=${NETWORK}
       - --p2p-port=9000
-      - --p2p-peer-upper-bound=${CC_PEER_COUNT}
       - --rest-api-host-allowlist=*
       - --rest-api-enabled=true
       - --rest-api-port=4000
diff --git a/internal/utils/testdata/checks_tests/case_2/sedge-data/.env b/internal/utils/testdata/checks_tests/case_2/sedge-data/.env
index 7879f0553..7903f2514 100644
--- a/internal/utils/testdata/checks_tests/case_2/sedge-data/.env
+++ b/internal/utils/testdata/checks_tests/case_2/sedge-data/.env
@@ -14,7 +14,6 @@ NETHERMIND_ETHSTATSCONFIG_NAME=Nethermind
 NETHERMIND_ETHSTATSCONFIG_SECRET=secret
 NETHERMIND_ETHSTATSCONFIG_CONTACT=hello@nethermind.io
 EC_DATA_DIR=./execution-data
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 NETWORK=mainnet
 EC_NODE=http://localhost:8545
diff --git a/internal/utils/testdata/checks_tests/case_2/sedge-data/no-docker-compose.yml b/internal/utils/testdata/checks_tests/case_2/sedge-data/no-docker-compose.yml
index d337595c7..1d73043fd 100644
--- a/internal/utils/testdata/checks_tests/case_2/sedge-data/no-docker-compose.yml
+++ b/internal/utils/testdata/checks_tests/case_2/sedge-data/no-docker-compose.yml
@@ -61,7 +61,6 @@ services:
       - --logging=${CC_LOG_LEVEL}
       - --network=${NETWORK}
       - --p2p-port=9000
-      - --p2p-peer-upper-bound=${CC_PEER_COUNT}
       - --rest-api-host-allowlist=*
       - --rest-api-enabled=true
       - --rest-api-port=4000
diff --git a/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml b/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml
index 41a203c61..08a694214 100644
--- a/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml
+++ b/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml
@@ -85,7 +85,6 @@ services:
     - --http-address=0.0.0.0
     - --http-port=4000
     - --network=${NETWORK}
-    - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
     - --eth1
diff --git a/internal/utils/testdata/validate_compose_tests/no_services/.env b/internal/utils/testdata/validate_compose_tests/no_services/.env
index 8b6e44601..7d2b7688a 100644
--- a/internal/utils/testdata/validate_compose_tests/no_services/.env
+++ b/internal/utils/testdata/validate_compose_tests/no_services/.env
@@ -10,7 +10,6 @@ EC_DATA_DIR=./execution-data
 EC_SNAP_SYNC_ENABLED=true
 EC_JWT_SECRET_PATH=/Users/teno/go/src/github.com/NethermindEth/1Click/sedge-data/jwtsecret
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL=http://execution:8545
 EC_AUTH_URL=http://execution:8551
diff --git a/internal/utils/testdata/validate_compose_tests/no_version/.env b/internal/utils/testdata/validate_compose_tests/no_version/.env
index 8b6e44601..7d2b7688a 100644
--- a/internal/utils/testdata/validate_compose_tests/no_version/.env
+++ b/internal/utils/testdata/validate_compose_tests/no_version/.env
@@ -10,7 +10,6 @@ EC_DATA_DIR=./execution-data
 EC_SNAP_SYNC_ENABLED=true
 EC_JWT_SECRET_PATH=/Users/teno/go/src/github.com/NethermindEth/1Click/sedge-data/jwtsecret
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL=http://execution:8545
 EC_AUTH_URL=http://execution:8551
diff --git a/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml b/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml
index a23d4e0d3..01cd34913 100644
--- a/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml
+++ b/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml
@@ -84,7 +84,6 @@ services:
     - --http-address=0.0.0.0
     - --http-port=4000
     - --network=${NETWORK}
-    - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
     - --eth1
diff --git a/internal/utils/testdata/validate_compose_tests/valid/.env b/internal/utils/testdata/validate_compose_tests/valid/.env
index 8b6e44601..7d2b7688a 100644
--- a/internal/utils/testdata/validate_compose_tests/valid/.env
+++ b/internal/utils/testdata/validate_compose_tests/valid/.env
@@ -10,7 +10,6 @@ EC_DATA_DIR=./execution-data
 EC_SNAP_SYNC_ENABLED=true
 EC_JWT_SECRET_PATH=/Users/teno/go/src/github.com/NethermindEth/1Click/sedge-data/jwtsecret
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL=http://execution:8545
 EC_AUTH_URL=http://execution:8551
diff --git a/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml b/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml
index 41a203c61..08a694214 100644
--- a/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml
+++ b/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml
@@ -85,7 +85,6 @@ services:
     - --http-address=0.0.0.0
     - --http-port=4000
     - --network=${NETWORK}
-    - --target-peers=${CC_PEER_COUNT}
     - --execution-endpoints=${EC_AUTH_URL}
     - --execution-jwt=/tmp/jwt/jwtsecret
     - --eth1
diff --git a/templates/envs/chiado/consensus/lighthouse.tmpl b/templates/envs/chiado/consensus/lighthouse.tmpl
index e17651f04..dc86e6eb8 100644
--- a/templates/envs/chiado/consensus/lighthouse.tmpl
+++ b/templates/envs/chiado/consensus/lighthouse.tmpl
@@ -1,7 +1,6 @@
 {{/* lighthouse.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/chiado/consensus/lodestar.tmpl b/templates/envs/chiado/consensus/lodestar.tmpl
index da3dd980a..a367eac43 100644
--- a/templates/envs/chiado/consensus/lodestar.tmpl
+++ b/templates/envs/chiado/consensus/lodestar.tmpl
@@ -1,7 +1,6 @@
 {{/* lodestar.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/chiado/consensus/teku.tmpl b/templates/envs/chiado/consensus/teku.tmpl
index d7a0560f3..168c9eb00 100644
--- a/templates/envs/chiado/consensus/teku.tmpl
+++ b/templates/envs/chiado/consensus/teku.tmpl
@@ -1,7 +1,6 @@
 {{/* teku.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/custom/consensus/lighthouse.tmpl b/templates/envs/custom/consensus/lighthouse.tmpl
index c64ce7aa5..822866e9a 100644
--- a/templates/envs/custom/consensus/lighthouse.tmpl
+++ b/templates/envs/custom/consensus/lighthouse.tmpl
@@ -1,7 +1,6 @@
 {{/* lighthouse.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/custom/consensus/lodestar.tmpl b/templates/envs/custom/consensus/lodestar.tmpl
index f1b971c4e..8275b4d89 100644
--- a/templates/envs/custom/consensus/lodestar.tmpl
+++ b/templates/envs/custom/consensus/lodestar.tmpl
@@ -1,7 +1,6 @@
 {{/* lodestar.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/custom/consensus/prysm.tmpl b/templates/envs/custom/consensus/prysm.tmpl
index 2adfaf32f..8452388c3 100644
--- a/templates/envs/custom/consensus/prysm.tmpl
+++ b/templates/envs/custom/consensus/prysm.tmpl
@@ -1,7 +1,6 @@
 {{/* prysm.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/custom/consensus/teku.tmpl b/templates/envs/custom/consensus/teku.tmpl
index 826e352c0..c29ba1997 100644
--- a/templates/envs/custom/consensus/teku.tmpl
+++ b/templates/envs/custom/consensus/teku.tmpl
@@ -1,7 +1,6 @@
 {{/* teku.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/gnosis/consensus/lighthouse.tmpl b/templates/envs/gnosis/consensus/lighthouse.tmpl
index de9a9116d..396d5c838 100644
--- a/templates/envs/gnosis/consensus/lighthouse.tmpl
+++ b/templates/envs/gnosis/consensus/lighthouse.tmpl
@@ -1,7 +1,6 @@
 {{/* lighthouse.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/gnosis/consensus/lodestar.tmpl b/templates/envs/gnosis/consensus/lodestar.tmpl
index 260e535de..fd6c0933c 100644
--- a/templates/envs/gnosis/consensus/lodestar.tmpl
+++ b/templates/envs/gnosis/consensus/lodestar.tmpl
@@ -1,7 +1,6 @@
 {{/* lodestar.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 CC_LODESTAR_PRESET=gnosis
 EC_API_URL={{.ExecutionApiURL}}
diff --git a/templates/envs/gnosis/consensus/teku.tmpl b/templates/envs/gnosis/consensus/teku.tmpl
index 3bf338468..86eacfc91 100644
--- a/templates/envs/gnosis/consensus/teku.tmpl
+++ b/templates/envs/gnosis/consensus/teku.tmpl
@@ -1,7 +1,6 @@
 {{/* teku.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/holesky/consensus/lighthouse.tmpl b/templates/envs/holesky/consensus/lighthouse.tmpl
index de9a9116d..396d5c838 100644
--- a/templates/envs/holesky/consensus/lighthouse.tmpl
+++ b/templates/envs/holesky/consensus/lighthouse.tmpl
@@ -1,7 +1,6 @@
 {{/* lighthouse.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/holesky/consensus/lodestar.tmpl b/templates/envs/holesky/consensus/lodestar.tmpl
index c78448baf..eb779e30a 100644
--- a/templates/envs/holesky/consensus/lodestar.tmpl
+++ b/templates/envs/holesky/consensus/lodestar.tmpl
@@ -1,7 +1,6 @@
 {{/* lodestar.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/holesky/consensus/prysm.tmpl b/templates/envs/holesky/consensus/prysm.tmpl
index c26d55016..ead180285 100644
--- a/templates/envs/holesky/consensus/prysm.tmpl
+++ b/templates/envs/holesky/consensus/prysm.tmpl
@@ -1,7 +1,6 @@
 {{/* prysm.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/holesky/consensus/teku.tmpl b/templates/envs/holesky/consensus/teku.tmpl
index 3bf338468..86eacfc91 100644
--- a/templates/envs/holesky/consensus/teku.tmpl
+++ b/templates/envs/holesky/consensus/teku.tmpl
@@ -1,7 +1,6 @@
 {{/* teku.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/mainnet/consensus/lighthouse.tmpl b/templates/envs/mainnet/consensus/lighthouse.tmpl
index de9a9116d..396d5c838 100644
--- a/templates/envs/mainnet/consensus/lighthouse.tmpl
+++ b/templates/envs/mainnet/consensus/lighthouse.tmpl
@@ -1,7 +1,6 @@
 {{/* lighthouse.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/mainnet/consensus/lodestar.tmpl b/templates/envs/mainnet/consensus/lodestar.tmpl
index c78448baf..eb779e30a 100644
--- a/templates/envs/mainnet/consensus/lodestar.tmpl
+++ b/templates/envs/mainnet/consensus/lodestar.tmpl
@@ -1,7 +1,6 @@
 {{/* lodestar.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/mainnet/consensus/prysm.tmpl b/templates/envs/mainnet/consensus/prysm.tmpl
index c26d55016..ead180285 100644
--- a/templates/envs/mainnet/consensus/prysm.tmpl
+++ b/templates/envs/mainnet/consensus/prysm.tmpl
@@ -1,7 +1,6 @@
 {{/* prysm.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/mainnet/consensus/teku.tmpl b/templates/envs/mainnet/consensus/teku.tmpl
index 3bf338468..86eacfc91 100644
--- a/templates/envs/mainnet/consensus/teku.tmpl
+++ b/templates/envs/mainnet/consensus/teku.tmpl
@@ -1,7 +1,6 @@
 {{/* teku.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/sepolia/consensus/lighthouse.tmpl b/templates/envs/sepolia/consensus/lighthouse.tmpl
index de9a9116d..396d5c838 100644
--- a/templates/envs/sepolia/consensus/lighthouse.tmpl
+++ b/templates/envs/sepolia/consensus/lighthouse.tmpl
@@ -1,7 +1,6 @@
 {{/* lighthouse.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/sepolia/consensus/lodestar.tmpl b/templates/envs/sepolia/consensus/lodestar.tmpl
index 8a9962503..b9c71ab96 100644
--- a/templates/envs/sepolia/consensus/lodestar.tmpl
+++ b/templates/envs/sepolia/consensus/lodestar.tmpl
@@ -1,7 +1,6 @@
 {{/* lodestar.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/sepolia/consensus/prysm.tmpl b/templates/envs/sepolia/consensus/prysm.tmpl
index c26d55016..ead180285 100644
--- a/templates/envs/sepolia/consensus/prysm.tmpl
+++ b/templates/envs/sepolia/consensus/prysm.tmpl
@@ -1,7 +1,6 @@
 {{/* prysm.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/envs/sepolia/consensus/teku.tmpl b/templates/envs/sepolia/consensus/teku.tmpl
index 3bf338468..86eacfc91 100644
--- a/templates/envs/sepolia/consensus/teku.tmpl
+++ b/templates/envs/sepolia/consensus/teku.tmpl
@@ -1,7 +1,6 @@
 {{/* teku.tmpl */}}
 {{ define "consensus" }}
 # --- Consensus Layer - Beacon Node - configuration ---
-CC_PEER_COUNT=50
 CC_LOG_LEVEL=info
 EC_API_URL={{.ExecutionApiURL}}
 EC_AUTH_URL={{.ExecutionAuthURL}}
diff --git a/templates/services/merge/consensus/lighthouse.tmpl b/templates/services/merge/consensus/lighthouse.tmpl
index 45e2b8566..0270689da 100644
--- a/templates/services/merge/consensus/lighthouse.tmpl
+++ b/templates/services/merge/consensus/lighthouse.tmpl
@@ -33,8 +33,7 @@
       - --http
       - --http-address=0.0.0.0
       - --http-port={{.ClApiPort}}{{if not .CustomConsensusConfigs}}
-      - --network={{if .SplittedNetwork}}${CL_NETWORK}{{else}}${NETWORK}{{end}}{{end}}
-      - --target-peers=${CC_PEER_COUNT}{{if .CCBootnodes}}
+      - --network={{if .SplittedNetwork}}${CL_NETWORK}{{else}}${NETWORK}{{end}}{{end}}{{if .CCBootnodes}}
       - --boot-nodes={{.CCBootnodes}}{{end}}
       - --execution-endpoints=${EC_AUTH_URL}
       - --execution-jwt=/tmp/jwt/jwtsecret
diff --git a/templates/services/merge/consensus/lodestar.tmpl b/templates/services/merge/consensus/lodestar.tmpl
index f7ffb511b..0e4121c60 100644
--- a/templates/services/merge/consensus/lodestar.tmpl
+++ b/templates/services/merge/consensus/lodestar.tmpl
@@ -41,7 +41,6 @@
       - --rest.cors=*
       - --discv5=true{{range $enr := .CCBootnodesList}}
       - --bootnodes={{$enr}}{{end}}
-      - --targetPeers=${CC_PEER_COUNT}
       - --metrics=true
       - --metrics.port={{.ClMetricsPort}}
       - --jwt-secret=/tmp/jwt/jwtsecret{{if or .ClCheckpointSyncUrl .CheckpointSyncUrl}}
diff --git a/templates/services/merge/consensus/prysm.tmpl b/templates/services/merge/consensus/prysm.tmpl
index 3e5970cfc..442944fcd 100644
--- a/templates/services/merge/consensus/prysm.tmpl
+++ b/templates/services/merge/consensus/prysm.tmpl
@@ -36,7 +36,6 @@
       - --grpc-gateway-port={{.ClApiPort}}
       - --datadir=/var/lib/prysm/
       - --verbosity=${CC_LOG_LEVEL}
-      - --p2p-max-peers=${CC_PEER_COUNT}
       - --execution-endpoint=${EC_AUTH_URL}{{range $url := .FallbackELUrls}}
       - --fallback-web3provider={{$url}}{{end}}
       - --accept-terms-of-use{{with .FeeRecipient}}
diff --git a/templates/services/merge/consensus/teku.tmpl b/templates/services/merge/consensus/teku.tmpl
index adfdaf20a..d52875553 100644
--- a/templates/services/merge/consensus/teku.tmpl
+++ b/templates/services/merge/consensus/teku.tmpl
@@ -32,7 +32,6 @@
       - --p2p-discovery-bootnodes={{.CCBootnodes}}{{end}}
       - --p2p-enabled=true
       - --p2p-port={{.ClDiscoveryPort}}
-      - --p2p-peer-upper-bound=${CC_PEER_COUNT}
       - --rest-api-enabled=true
       - --rest-api-host-allowlist=*
       - --rest-api-interface=0.0.0.0