diff --git a/templates/silent-install.conf.j2 b/templates/silent-install.conf.j2
index ec2238d..bcc56aa 100644
--- a/templates/silent-install.conf.j2
+++ b/templates/silent-install.conf.j2
@@ -10,19 +10,21 @@
 {% if opdk_ldap_type == '2' %}
 {% if groups['dc-1-ldap'] is defined and groups['dc-2-ldap'] is defined and inventory_hostname in groups['dc-1-edge'] %}
 LDAP_SID=1
-LDAP_PEER={{ hostvars[groups['dc-2-ldap'][0]]['private_address'] }}
+LDAP_PEER={{ hostvars[groups['dc-2-ldap'][0]]['private_address']  }}
 {% endif %}
 {% if groups['dc-1-ldap'] is defined and groups['dc-2-ldap'] is defined and inventory_hostname in groups['dc-2-edge'] %}
 LDAP_SID=2
-LDAP_PEER={{ hostvars[groups['dc-1-ldap'][0]]['private_address'] }}
+LDAP_PEER={{ hostvars[groups['dc-1-ldap'][0]]['private_address']  }}
 {% endif %}
 {% endif %}
 APIGEE_LDAPPW='{{ opdk_ldap_pass }}'
-{% elif %}
+{% endif %}
+{% if use_opdk_ldap_remote_host is defined and use_opdk_ldap_remote_host | trim | lower == 'y' %}
 LDAP_HOST={{ opdk_ldap_host }}
 LDAP_PORT={{ opdk_ldap_port }}
 {% endif %}
 
+
 ENABLE_AX={{ opdk_enable_ax }}
 MP_POD={{ opdk_mp_pod | default(default_mp_pod) }}