diff --git a/roles/pbx/tasks/freepbx.yml b/roles/pbx/tasks/freepbx.yml
index 7380a5428..70e619b9c 100644
--- a/roles/pbx/tasks/freepbx.yml
+++ b/roles/pbx/tasks/freepbx.yml
@@ -191,16 +191,16 @@
 # http://mghadam.blogspot.com/2021/03/install-asterisk-18-freepbx-15-on.html
 - name: FreePBX - Install /etc/odbc.ini, /etc/odbcinst.ini from template (root:root, 0644 by default)
   template:
-    src: "{{ item }}"
-    dest: /etc/
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
   with_items:
-    - odbc.ini
-    - odbcinst.ini
+    - { src: odbc.ini.j2, dest: /etc/odbc.ini }
+    - { src: odbcinst.ini, dest: /etc/odbcinst.ini }
 
 - name: FreePBX - Install /etc/asterisk/cdr_mysql.conf from template (root:root, 0644 by default)
   template:
-    src: cdr_mysql.conf
-    dest: /etc/asterisk/
+    src: cdr_mysql.conf.j2
+    dest: /etc/asterisk/cdr_mysql.conf
 
 
 - name: FreePBX - 2-step install - won't run if {{ freepbx_install_dir }} already exists - CAN TAKE 3-12 MIN OR LONGER!
diff --git a/roles/pbx/templates/cdr_mysql.conf b/roles/pbx/templates/cdr_mysql.conf
deleted file mode 100644
index 2fe025c73..000000000
--- a/roles/pbx/templates/cdr_mysql.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[global]
-hostname = localhost
-dbname = asteriskcdrdb
-user = asterisk
-password = asterisk
-userfield = 1
diff --git a/roles/pbx/templates/cdr_mysql.conf.j2 b/roles/pbx/templates/cdr_mysql.conf.j2
new file mode 100644
index 000000000..5935118f9
--- /dev/null
+++ b/roles/pbx/templates/cdr_mysql.conf.j2
@@ -0,0 +1,6 @@
+[global]
+hostname = localhost
+dbname = {{ asterisk_db_cdrdbname }}
+user = {{ asterisk_db_password }}
+password = {{ asterisk_db_password }}
+userfield = 1
diff --git a/roles/pbx/templates/odbc.ini b/roles/pbx/templates/odbc.ini.j2
similarity index 81%
rename from roles/pbx/templates/odbc.ini
rename to roles/pbx/templates/odbc.ini.j2
index 9ed77609a..65576d186 100644
--- a/roles/pbx/templates/odbc.ini
+++ b/roles/pbx/templates/odbc.ini.j2
@@ -2,7 +2,7 @@
 Description=MySQL connection to 'asteriskcdrdb' database
 driver=MySQL
 server=localhost
-database=asteriskcdrdb
+database={{ asterisk_db_cdrdbname }}
 Port=3306
 Socket=/var/run/mysqld/mysqld.sock
 option=3