diff --git a/fuel_ccp_entrypoint/start_script.py b/fuel_ccp_entrypoint/start_script.py
index 9a048bc..92a74e0 100644
--- a/fuel_ccp_entrypoint/start_script.py
+++ b/fuel_ccp_entrypoint/start_script.py
@@ -295,7 +295,8 @@ def get_etcd_client():
     etcd_machines = []
     # if it's etcd container use local address because container is not
     # accessible via service due failed readiness check
-    if VARIABLES["role_name"] == "etcd":
+    if VARIABLES["role_name"] in ["etcd", "etcd-leader-elector",
+                                  "etcd-watcher"]:
         etcd_machines.append(
             (VARIABLES["network_topology"]["private"]["address"],
              VARIABLES["etcd"]["client_port"]['cont']))