diff --git a/config.py b/config.py
index fecd628..dc2155f 100755
--- a/config.py
+++ b/config.py
@@ -15,10 +15,7 @@ logging.basicConfig(
     datefmt="%d-%b-%y %H:%M:%S",
 )
 
-# TODO: Remove timeout, use certificate authentication
-etcd_client = Etcd3Wrapper(host=config("ETCD_URL"), user="root",
-                           password=config("ETCD_PASSWORD"),
-                           timeout=2629746)
+etcd_client = Etcd3Wrapper(host=config("ETCD_URL"))
 
 host_pool = HostPool(etcd_client, "/v1/host")
 vm_pool = VmPool(etcd_client, "/v1/vm")