diff --git a/main.py b/main.py
index 614f6a4..c159881 100755
--- a/main.py
+++ b/main.py
@@ -16,10 +16,7 @@ logging.basicConfig(
     datefmt="%d-%b-%y %H:%M:%S",
 )
 
-# TODO: Remove timeout, use certificate authentication
-client = Etcd3Wrapper(host=config("ETCD_URL"), user="root",
-                      password=config("ETCD_PASSWORD"),
-                      timeout=2629746)
+client = Etcd3Wrapper(host=config("ETCD_URL"))
 images = list(client.get_prefix("/v1/image/", value_in_json=True))
 images_to_be_created = list(filter(lambda e: e.value["status"] == "TO_BE_CREATED", images))