diff --git a/datafari-tomcat/conf-datafari/mcf-postgres.properties b/datafari-tomcat/conf-datafari/mcf-postgres.properties
index d554ddf7c..a4a5d4480 100644
--- a/datafari-tomcat/conf-datafari/mcf-postgres.properties
+++ b/datafari-tomcat/conf-datafari/mcf-postgres.properties
@@ -1,6 +1,6 @@
-HOST=localhost
-PORT=5432
-DATABASE=manifoldcf
-USER=postgres
+HOST=@POSTGRESQLHOSTNAME@
+PORT=@POSTGRESQLPORT@
+DATABASE=@POSTGRESQLDATABASE@
+USER=@POSTGRESQLUSERNAME@
 PASSWORD=@POSTGRESPASSWORD@
 TABLENAME=repohistory
\ No newline at end of file
diff --git a/linux/bin/init-datafari.sh b/linux/bin/init-datafari.sh
index 79bcdb6ea..e7016382c 100644
--- a/linux/bin/init-datafari.sh
+++ b/linux/bin/init-datafari.sh
@@ -382,6 +382,12 @@ init_postgresql() {
   sed -i -e "s~@POSTGRESQLPORT@~${POSTGRESQL_PORT}~g" $MCF_HOME/properties-global.xml >>$installerLog 2>&1
   sed -i -e "s~@POSTGRESQLDATABASE@~${POSTGRESQL_DATABASE}~g" $MCF_HOME/properties-global.xml >>$installerLog 2>&1
   sed -i -e "s~@POSTGRESQLUSERNAME@~${POSTGRESQL_USERNAME}~g" $MCF_HOME/properties-global.xml >>$installerLog 2>&1
+  
+  sed -i -e "s~@POSTGRESQLHOSTNAME@~${POSTGRESQL_HOSTNAME}~g" $TOMCAT_HOME/conf/mcf-postgres.properties >>$installerLog 2>&1
+  sed -i -e "s~@POSTGRESQLPORT@~${POSTGRESQL_PORT}~g" $TOMCAT_HOME/conf/mcf-postgres.properties >>$installerLog 2>&1
+  sed -i -e "s~@POSTGRESQLDATABASE@~${POSTGRESQL_DATABASE}~g" $TOMCAT_HOME/conf/mcf-postgres.properties >>$installerLog 2>&1
+  sed -i -e "s~@POSTGRESQLUSERNAME@~${POSTGRESQL_USERNAME}~g" $TOMCAT_HOME/conf/mcf-postgres.properties >>$installerLog 2>&1
+  
 }
 
 init_password_postgresql() {