diff --git a/data/elastic-recheck.conf b/data/elastic-recheck.conf
index 82a08d1b..25e6dd0e 100644
--- a/data/elastic-recheck.conf
+++ b/data/elastic-recheck.conf
@@ -10,16 +10,16 @@
 [ircbot]
 # nick=${IRC_NICK}
 # pass=${IRC_PASS}
-server=irc.freenode.net
+server=irc.oftc.net
 port=6667
 channel_config=recheckwatchbot.yaml
 # log_config=${LOG_CONFIG}
 
 [gerrit]
-# host=${GERRIT_HOST}
-# user=${GERRIT_USER}
-# query_file=${GERRIT_QUERY_FILE}
-# key=data/id_rsa
+host=${GERRIT_HOST}
+user=${GERRIT_USER}
+query_file=${GERRIT_QUERY_FILE}
+key=data/id_rsa
 
 [data_source]
 es_url=${ES_URL}
diff --git a/elastic_recheck/cmd/__init__.py b/elastic_recheck/cmd/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/elastic_recheck/config.py b/elastic_recheck/config.py
index 0b631d9e..3bf2b344 100644
--- a/elastic_recheck/config.py
+++ b/elastic_recheck/config.py
@@ -37,11 +37,11 @@ DEFAULTS = {
     'GERRIT_HOST': 'review.opendev.org',
     'GERRIT_USER': None,
     'IRC_LOG_CONFIG': '',
-    'IRC_SERVER': "irc.freenode.net",
+    'IRC_SERVER': "irc.oftc.net",
     'IRC_PORT': "6667",
     'IRC_PASS': "",
-    'IRC_SERVER_PASSWORD': "",
-    'IRC_NICK': "",
+    'IRC_SERVER_PASSWORD': "erbot",
+    'IRC_NICK': "erbot",
 }
 
 # Not all teams actively used elastic recheck for categorizing their