diff --git a/main.py b/main.py
index 05617d2..3a6665f 100755
--- a/main.py
+++ b/main.py
@@ -35,7 +35,10 @@ BASE_DIR = config("BASE_DIR")
 
 FILE_PREFIX = config("FILE_PREFIX")
 
-etcd_client = Etcd3Wrapper(host=config("ETCD_URL"), user="root", password=config("ETCD_URL"))
+# TODO: Remove timeout, use certificate authentication
+etcd_client = Etcd3Wrapper(host=config("ETCD_URL"), user="root",
+                           password=config("ETCD_PASSWORD"),
+                           timeout=2629746)
 
 # Recursively Get All Files and Folder below BASE_DIR
 files = glob.glob(f"{BASE_DIR}/**", recursive=True)