diff --git a/roles/nhc/templates/nhc.sysconfig.j2 b/roles/nhc/templates/nhc.sysconfig.j2
index a91646c3673a75b56ed0017306dc72462ff28528..d9d80f046cbf7382c69ccbec461c21aaee9379b3 100644
--- a/roles/nhc/templates/nhc.sysconfig.j2
+++ b/roles/nhc/templates/nhc.sysconfig.j2
@@ -1,4 +1,4 @@
-CONFDIR={{ nhc_dir }}/etc/nhc
+NFDIR={{ nhc_dir }}/etc/nhc
 NHC_RM=slurm
 HELPERDIR={{ nhc_dir }}/libexec/nhc
 PATH={{ slurm_dir }}/bin:{{ nhc_dir }}/sbin:$PATH
@@ -9,4 +9,6 @@ NHC_EMAIL_TO="{{ nhc_emails }}"
 NHC_EMAIL_SUBJECT="{{ nhc_email_subject }}"
 NHC_LOOP_TIME="300"
 DF_FLAGS="-Tk"
+# Timeout value added temporarily by Trung - 20200409
+TIMEOUT=150