diff --git a/resources/templates/conf/autoload_configs/cidlookup.conf.xml b/resources/templates/conf/autoload_configs/cidlookup.conf.xml
index fd1928fb83..21af42847f 100644
--- a/resources/templates/conf/autoload_configs/cidlookup.conf.xml
+++ b/resources/templates/conf/autoload_configs/cidlookup.conf.xml
@@ -12,7 +12,7 @@
     <!-- expire is in seconds -->
     <param name="cache-expire" value="86400"/>
 
-    <param name="odbc-dsn" value="{v_dsn}"/>
+    <param name="odbc-dsn" value="$${dsn_system}"/>
 
     <!-- comment out sql to not setup a database (directory) lookup -->
     <param name="sql" value="
diff --git a/resources/templates/conf/autoload_configs/lcr.conf.xml b/resources/templates/conf/autoload_configs/lcr.conf.xml
index 9d106d4890..a752591f85 100644
--- a/resources/templates/conf/autoload_configs/lcr.conf.xml
+++ b/resources/templates/conf/autoload_configs/lcr.conf.xml
@@ -1,7 +1,6 @@
 <configuration name="lcr.conf" description="LCR Configuration">
   <settings>
-    <param name="odbc-dsn" value="freeswitch-mysql:freeswitch:Fr33Sw1tch"/>
-<!--    <param name="odbc-dsn" value="freeswitch-pgsql:freeswitch:Fr33Sw1tch"/> -->
+    <param name="odbc-dsn" value="$${dsn_system}"/>
   </settings>
   <profiles>
     <profile name="default">