diff --git a/templates/devportal-silent-install.conf.j2 b/templates/devportal-silent-install.conf.j2
index 4114a7d..2b05c37 100644
--- a/templates/devportal-silent-install.conf.j2
+++ b/templates/devportal-silent-install.conf.j2
@@ -1,12 +1,9 @@
-MSIP={{ local_mgmt_ip }}
-DBIP="{{ dp_pg_ip }}"
-
 HOSTIP="$(hostname -i)"
 PG_NAME="devportal"
 PG_USER="{{ devportal_pg_user | default(pg_user) }}"
 PG_PWD={{ devportal_pg_pass | default(pg_pass) }}
 
-PG_HOST="$DBIP"
+PG_HOST={{ dp_pg_ip }}
 DEFAULT_DB="postgres"
 
 DRUPAL_PG_USER="{{ drupal_pg_user }}"
@@ -19,12 +16,12 @@
 DEVPORTAL_ADMIN_EMAIL="{{ dp_admin_email }}"
 
 EDGE_ORG="{{ org_name }}"
-MGMT_URL="http://$MSIP:8080/v1"
+MGMT_URL="http://{{ local_mgmt_ip }}:8080/v1"
 DEVADMIN_USER="{{ dp_devadmin_user }}"
 DEVADMIN_PWD="{{ dp_devadmin_pwd }}"
 
 SMTPHOST={{ opdk_smtp_host }}
 SMTPSSL={{ opdk_smtp_ssl }}
 SMTPPORT={{ opdk_smtp_port }}
-SMTPUSER={{ opdk_smtp_user }}
-SMTPPASSWORD={{ opdk_smtp_password }}
+SMTPUSER={{ opdk_smtp_user | default(dp_devadmin_user) }}
+SMTPPASSWORD={{ opdk_smtp_password | default(dp_devadmin_pwd) }}