diff --git a/main.py b/main.py
index 606bcfa..df6f270 100755
--- a/main.py
+++ b/main.py
@@ -16,7 +16,10 @@ logging.basicConfig(
     datefmt="%d-%b-%y %H:%M:%S",
 )
 
-client = Etcd3Wrapper(host=config("ETCD_URL"), user="root", password=config("ETCD_PASSWORD"))
+# TODO: Remove timeout, use certificate authentication
+etcd_client = Etcd3Wrapper(host=config("ETCD_URL"), user="root",
+                           password=config("ETCD_PASSWORD"),
+                           timeout=2629746)
 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))