diff --git a/includes/templates/conf/autoload_configs/callcenter.conf.xml b/includes/templates/conf/autoload_configs/callcenter.conf.xml
index 54e7e78c56..40f25aca98 100644
--- a/includes/templates/conf/autoload_configs/callcenter.conf.xml
+++ b/includes/templates/conf/autoload_configs/callcenter.conf.xml
@@ -1,6 +1,6 @@
 <configuration name="callcenter.conf" description="CallCenter">
 	<settings>
-		<!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
+		<!--<param name="odbc-dsn" value="${dsn}"/>-->
 		<!--<param name="dbname" value="/usr/local/freeswitch/db/call_center.db"/>-->
 	</settings>
 
diff --git a/includes/templates/conf/autoload_configs/cidlookup.conf.xml b/includes/templates/conf/autoload_configs/cidlookup.conf.xml
index 585c0bcc04..fd1928fb83 100644
--- a/includes/templates/conf/autoload_configs/cidlookup.conf.xml
+++ b/includes/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="fusionpbx:username:password"/>
+    <param name="odbc-dsn" value="{v_dsn}"/>
 
     <!-- comment out sql to not setup a database (directory) lookup -->
     <param name="sql" value="
diff --git a/includes/templates/conf/autoload_configs/db.conf.xml b/includes/templates/conf/autoload_configs/db.conf.xml
index abc6c0c152..b90c5a8113 100644
--- a/includes/templates/conf/autoload_configs/db.conf.xml
+++ b/includes/templates/conf/autoload_configs/db.conf.xml
@@ -1,5 +1,5 @@
 <configuration name="db.conf" description="LIMIT DB Configuration">
   <settings>
-    <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
+    <!--<param name="odbc-dsn" value="${dsn}"/>-->
   </settings>
 </configuration>
diff --git a/includes/templates/conf/autoload_configs/directory.conf.xml b/includes/templates/conf/autoload_configs/directory.conf.xml
index 748b2337c4..2064095b83 100644
--- a/includes/templates/conf/autoload_configs/directory.conf.xml
+++ b/includes/templates/conf/autoload_configs/directory.conf.xml
@@ -1,6 +1,6 @@
 <configuration name="directory.conf" description="Directory">
   <settings>
-      <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
+      <!--<param name="odbc-dsn" value="${dsn}"/>-->
       <!--<param name="dbname" value="directory"/>-->
   </settings>
   <profiles>
diff --git a/includes/templates/conf/autoload_configs/switch.conf.xml b/includes/templates/conf/autoload_configs/switch.conf.xml
index 044a618eeb..97237abb2b 100644
--- a/includes/templates/conf/autoload_configs/switch.conf.xml
+++ b/includes/templates/conf/autoload_configs/switch.conf.xml
@@ -143,7 +143,7 @@
 
 		<param name="rtp-enable-zrtp" value="true"/>
 
-		<!-- <param name="core-db-dsn" value="dsn:username:password" /> -->
+		<!-- <param name="core-db-dsn" value="${dsn}" /> -->
 		<!-- 
 		 Allow to specify the sqlite db at a different location (In this example, move it to ramdrive for
 		 better performance on most linux distro (note, you loose the data if you reboot))
diff --git a/includes/templates/conf/autoload_configs/voicemail.conf.xml b/includes/templates/conf/autoload_configs/voicemail.conf.xml
index ed812b22f3..a33ea000eb 100644
--- a/includes/templates/conf/autoload_configs/voicemail.conf.xml
+++ b/includes/templates/conf/autoload_configs/voicemail.conf.xml
@@ -61,7 +61,7 @@
         <param name="email-from" value="${voicemail_account}@${voicemail_domain}"/>
       </email>
       <!--<param name="storage-dir" value="/tmp"/>-->
-      <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
+      <!--<param name="odbc-dsn" value="${dsn}"/>-->
       <!--<param name="record-comment" value="Your Comment"/>-->
       <!--<param name="record-title" value="Your Title"/>-->
       <!--<param name="record-copyright" value="Your Copyright"/>-->
diff --git a/includes/templates/conf/sip_profiles/internal.xml b/includes/templates/conf/sip_profiles/internal.xml
index 4e176cad1f..3e6169f5eb 100644
--- a/includes/templates/conf/sip_profiles/internal.xml
+++ b/includes/templates/conf/sip_profiles/internal.xml
@@ -200,7 +200,7 @@
 		<!--<param name="rtp-rewrite-timestamps" value="true"/>-->
 		<!--<param name="pass-rfc2833" value="true"/>-->
 		<!--If you have ODBC support and a working dsn you can use it instead of SQLite-->
-		<!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
+		<!--<param name="odbc-dsn" value="${dsn}"/>-->
 
 		<!--Uncomment to set all inbound calls to no media mode-->
 		<!--<param name="inbound-bypass-media" value="true"/>-->