diff --git a/defaults/main.yml b/defaults/main.yml
index ca14a32..08eff21 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -11,9 +11,6 @@ zigbee2mqtt_base_dir: /opt/zigbee2mqtt
 zigbee2mqtt_log_dir: "{{ zigbee2mqtt_base_dir }}/log"
 zigbee2mqtt_log_level: info
 
-zigbee2mqtt_devices_file: "{{ zigbee2mqtt_base_dir }}/data/devices.yaml"
-zigbee2mqtt_groups_file: "{{ zigbee2mqtt_base_dir }}/data/devices.yaml"
-
 zigbee2mqtt_homeassistant_enabled: False
 zigbee2mqtt_permit_join: True
 
diff --git a/templates/zigbee2mqtt/data/configuration.yaml.j2 b/templates/zigbee2mqtt/data/configuration.yaml.j2
index 8465964..f7c4f56 100644
--- a/templates/zigbee2mqtt/data/configuration.yaml.j2
+++ b/templates/zigbee2mqtt/data/configuration.yaml.j2
@@ -57,5 +57,5 @@ queue:
   delay: 250
   simultaneously: 5
 
-devices: "{{ zigbee2mqtt_devices_file }}"
-groups: "{{ zigbee2mqtt_groups_file }}"
+devices: "devices.yaml"
+groups: "groups.yaml"