diff --git a/defaults/main.yml b/defaults/main.yml
index 8b168e1b..57bc27ba 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -255,7 +255,7 @@ lxc_hosts_opensuse_mirror_obs_url: "{{ lxc_hosts_opensuse_mirror_url }}"
 
 ## A list of 'legacy' lxc configuration keys and their corresponding new
 ## keys. Use this map to substitute keys suitable for other/newer lxc versions
-lxc_config_key_mapping:
+lxc_template_config_key_mapping:
   3:
     fstab: lxc.mount.fstab
     rootfs: lxc.rootfs.path
diff --git a/templates/lxc-machinectl.j2 b/templates/lxc-machinectl.j2
index 683fef52..3d64e3cb 100644
--- a/templates/lxc-machinectl.j2
+++ b/templates/lxc-machinectl.j2
@@ -157,11 +157,11 @@ echo -e "\n# Container specific configuration" >> "${LXC_PATH}/config"
 
 # If an older fstab file exists in the template, extend the lxc config.
 if [ -e "${LXC_CACHE_PATH}/fstab" ]; then
-    echo "{{ lxc_config_key_mapping[lxc_major_version|int]['fstab'] }} = ${LXC_PATH}/fstab" >> "${LXC_PATH}/config"
+    echo "{{ lxc_template_config_key_mapping[lxc_major_version|int]['fstab'] }} = ${LXC_PATH}/fstab" >> "${LXC_PATH}/config"
 fi
 
 # Set the uts name
-echo "{{ lxc_config_key_mapping[lxc_major_version|int]['uts_name'] }} = ${LXC_NAME}" >> "${LXC_PATH}/config"
+echo "{{ lxc_template_config_key_mapping[lxc_major_version|int]['uts_name'] }} = ${LXC_NAME}" >> "${LXC_PATH}/config"
 
 # Look for extra templates
 TEMPLATE_FILES="${LXC_PATH}/config"
@@ -187,17 +187,17 @@ done
 IFS=${OLD_IFS}
 
 # Add the machinectl backend store for the new container
-if grep -q '^{{ lxc_config_key_mapping[lxc_major_version|int]['rootfs'] }} =' "${LXC_PATH}/config"; then
-  sed -i "s|^{{ lxc_config_key_mapping[lxc_major_version|int]['rootfs'] }} =.*|{{ lxc_config_key_mapping[lxc_major_version|int]['rootfs'] }} = ${LXC_ROOTFS}|" "${LXC_PATH}/config"
+if grep -q '^{{ lxc_template_config_key_mapping[lxc_major_version|int]['rootfs'] }} =' "${LXC_PATH}/config"; then
+  sed -i "s|^{{ lxc_template_config_key_mapping[lxc_major_version|int]['rootfs'] }} =.*|{{ lxc_template_config_key_mapping[lxc_major_version|int]['rootfs'] }} = ${LXC_ROOTFS}|" "${LXC_PATH}/config"
 else
-  echo "{{ lxc_config_key_mapping[lxc_major_version|int]['rootfs'] }} = ${LXC_ROOTFS}" >> "${LXC_PATH}/config"
+  echo "{{ lxc_template_config_key_mapping[lxc_major_version|int]['rootfs'] }} = ${LXC_ROOTFS}" >> "${LXC_PATH}/config"
 fi
 
 {% if (lxc_major_version | int) < 3 %}
-if grep -q '^{{ lxc_config_key_mapping[lxc_major_version|int]['rootfs_backend'] }} =' "${LXC_PATH}/config"; then
-  sed -i "s|^{{ lxc_config_key_mapping[lxc_major_version|int]['rootfs_backend'] }} =.*|{{ lxc_config_key_mapping[lxc_major_version|int]['rootfs_backend'] }} = btrfs|" "${LXC_PATH}/config"
+if grep -q '^{{ lxc_template_config_key_mapping[lxc_major_version|int]['rootfs_backend'] }} =' "${LXC_PATH}/config"; then
+  sed -i "s|^{{ lxc_template_config_key_mapping[lxc_major_version|int]['rootfs_backend'] }} =.*|{{ lxc_template_config_key_mapping[lxc_major_version|int]['rootfs_backend'] }} = btrfs|" "${LXC_PATH}/config"
 else
-  echo "{{ lxc_config_key_mapping[lxc_major_version|int]['rootfs_backend'] }} = btrfs" >> "${LXC_PATH}/config"
+  echo "{{ lxc_template_config_key_mapping[lxc_major_version|int]['rootfs_backend'] }} = btrfs" >> "${LXC_PATH}/config"
 fi
 {% endif %}