diff --git a/src/light_beaconchain/light_beaconchain_launcher.star b/src/light_beaconchain/light_beaconchain_launcher.star
index 3cd023a18..c8e1a12c0 100644
--- a/src/light_beaconchain/light_beaconchain_launcher.star
+++ b/src/light_beaconchain/light_beaconchain_launcher.star
@@ -29,10 +29,11 @@ def launch_light_beacon(
 		cl_client_contexts,
 	):
 
-	cl_client_info = []
-	cl_client_info.append(new_cl_client_info(cl_client_contexts[0].ip_addr, cl_client_contexts[0].http_port_num, cl_client_contexts[0].beacon_service_name))
+	all_cl_client_info = []
+	for index, client in enumerate(cl_client_contexts):
+		all_cl_client_info.append(new_cl_client_info(client.ip_addr, client.http_port_num, client.beacon_service_name))
 
-	template_data = new_config_template_data(HTTP_PORT_NUMBER, cl_client_info)
+	template_data = new_config_template_data(HTTP_PORT_NUMBER, all_cl_client_info)
 
 	template_and_data = shared_utils.new_template_and_data(config_template, template_data)
 	template_and_data_by_rel_dest_filepath = {}
diff --git a/static_files/light-beaconchain-config/config.yaml.tmpl b/static_files/light-beaconchain-config/config.yaml.tmpl
index 2931a29bf..1b63681ab 100644
--- a/static_files/light-beaconchain-config/config.yaml.tmpl
+++ b/static_files/light-beaconchain-config/config.yaml.tmpl
@@ -34,8 +34,11 @@ frontend:
 
 beaconapi:
   # CL Client RPC
+  endpoints:
 {{ range $clClient := .CLClientInfo }}
-  endpoint: "http://{{ $clClient.IPAddr }}:{{ $clClient.PortNum }}"
+    - url: "http://{{ $clClient.IPAddr }}:{{ $clClient.PortNum }}"
+      name: "{{ $clClient.Name }}"
+      archive: true
 {{- end }}
   # local cache for page models
   localCacheSize: 100 # 100MB