diff --git a/env-hbase-exporter.j2 b/env-hbase-exporter.j2
index 40cb90e..eda9610 100644
--- a/env-hbase-exporter.j2
+++ b/env-hbase-exporter.j2
@@ -1,6 +1,6 @@
 EXPORT_REFRESH_RATE="{{ hbase_exporter_refresh_rate }}"
 HBASE_HOST="{{ hbase_exporter_hbase_host }}"
-HBASE_TABLE_NAME="{{ hbase_exporter_hbase_tablename }}" 
+HBASE_TABLE_NAME="{{ hbase_exporter_hbase_tablename }}"
 HBCK_REFRESH_RATE="{{ hbase_exporter_hbck_refresh_rate }}"
 ZOOKEEPER_SERVER_1="{{ zookeeper_server_1 }}"
 ZOOKEEPER_SERVER_2="{{ zookeeper_server_2 }}"
diff --git a/hbase-exporter.service b/hbase-exporter.service
index 6dc5794..7f2b60e 100644
--- a/hbase-exporter.service
+++ b/hbase-exporter.service
@@ -5,11 +5,11 @@ After=network-online.target
 [Service]
 User=hdfs
 EnvironmentFile=/etc/env-hbase-exporter
-ExecStart=/usr/local/bin/hbase-exporter --zookeeper-server-address=${ZK_SERVER_1} \
-                                        --zookeeper-server-address=${ZK_SERVER_2} \
-                                        --zookeeper-server-address=${ZK_SERVER_3} \
-                                        --zookeeper-server-address=${ZK_SERVER_4} \
-                                        --zookeeper-server-address=${ZK_SERVER_5} \
+ExecStart=/usr/local/bin/hbase-exporter --zookeeper-server-address=${ZOOKEEPER_SERVER_1} \
+                                        --zookeeper-server-address=${ZOOKEEPER_SERVER_2} \
+                                        --zookeeper-server-address=${ZOOKEEPER_SERVER_3} \
+                                        --zookeeper-server-address=${ZOOKEEPER_SERVER_4} \
+                                        --zookeeper-server-address=${ZOOKEEPER_SERVER_5} \
                                         --export-refresh-rate=${EXPORT_REFRESH_RATE} \
                                         --hbck-refresh-rate=${HBCK_REFRESH_RATE}
 Restart=always