diff --git a/config.py b/config.py
index 838af89..b88819f 100644
--- a/config.py
+++ b/config.py
@@ -1,15 +1,13 @@
 from etcd3_wrapper import Etcd3Wrapper
 import decouple
 
-__ETCD_HOST = decouple.config("ETCD_HOST", None)
-__ETCD_PORT = decouple.config("ETCD_PORT", None)
-__CA_CERT = decouple.config("CA_CERT", None)
-__CERT_CERT = decouple.config("CERT_CERT", None)
-__CERT_KEY = decouple.config("CERT_KEY", None)
+etcd_wrapper_args = ()
+etcd_wrapper_kwargs = {
+    'host': decouple.config('ETCD_URL', 'localhost'),
+    'port': decouple.config('ETCD_PORT', 2379),
+    'ca_cert': decouple.config('CA_CERT', None),
+    'cert_cert': decouple.config('CERT_CERT', None),
+    'cert_key': decouple.config('CERT_KEY', None)
+}
 
-if __ETCD_HOST and __ETCD_PORT and __CA_CERT and __CERT_CERT and __CERT_KEY:
-    etcd_client = Etcd3Wrapper(host=__ETCD_HOST, port=__ETCD_PORT,
-                               ca_cert=__CA_CERT, cert_cert=__CERT_CERT,
-                               cert_key=__CERT_KEY)
-else:
-    etcd_client = Etcd3Wrapper()
+etcd_client = Etcd3Wrapper(*etcd_wrapper_args, **etcd_wrapper_kwargs)