diff --git a/intern/docker_homeassistant/templates/config/configuration.yaml b/intern/docker_homeassistant/templates/config/configuration.yaml
index 94e0d62b428f0b0a266cdaf089cbfe16b5c9d925..cb89ecbe569ba91192d3cb0da9b8e2ca92e2ffe2 100644
--- a/intern/docker_homeassistant/templates/config/configuration.yaml
+++ b/intern/docker_homeassistant/templates/config/configuration.yaml
@@ -279,55 +279,55 @@ automation ansible:
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_backcenter_off
+              entity_id: automation.ANSIBLE_ZONE_backcenter_aus
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_dreckcenter_off
+              entity_id: automation.ANSIBLE_ZONE_dreckcenter_aus
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_gehcenter_off
+              entity_id: automation.ANSIBLE_ZONE_gehcenter_aus
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_hackcenter_off
+              entity_id: automation.ANSIBLE_ZONE_hackcenter_aus
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_kackcenter_off
+              entity_id: automation.ANSIBLE_ZONE_kackcenter_aus
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_loetcenter_off 
+              entity_id: automation.ANSIBLE_ZONE_loetcenter_aus 
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_rackcenter_off
+              entity_id: automation.ANSIBLE_ZONE_rackcenter_aus
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_saal1_off
+              entity_id: automation.ANSIBLE_ZONE_saal1_aus
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_schnackcenter_off
+              entity_id: automation.ANSIBLE_ZONE_schnackcenter_aus
           - action: automation.trigger
             metadata: {}
             data:
@@ -351,55 +351,55 @@ automation ansible:
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_backcenter_on
+              entity_id: automation.ANSIBLE_ZONE_backcenter_an
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_dreckcenter_on
+              entity_id: automation.ANSIBLE_ZONE_dreckcenter_an
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_gehcenter_on
+              entity_id: automation.ANSIBLE_ZONE_gehcenter_an
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_hackcenter_on
+              entity_id: automation.ANSIBLE_ZONE_hackcenter_an
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_kackcenter_on
+              entity_id: automation.ANSIBLE_ZONE_kackcenter_an
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_loetcenter_on 
+              entity_id: automation.ANSIBLE_ZONE_loetcenter_an 
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_rackcenter_on
+              entity_id: automation.ANSIBLE_ZONE_rackcenter_an
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_saal1_on
+              entity_id: automation.ANSIBLE_ZONE_saal1_an
           - action: automation.trigger
             metadata: {}
             data:
               skip_condition: true
             target:
-              entity_id: automation.ansible_schnackcenter_on
+              entity_id: automation.ANSIBLE_ZONE_schnackcenter_an
 
   # set zonenstatus
   - alias: ANSIBLE_zonenstatus_set
@@ -699,7 +699,7 @@ automation ansible:
         metadata: {}
         data: {}
         target:
-          area_id: backcenter
+          area_id: dreckcenter
     mode: single
 
   - alias: ANSIBLE_ZONE_gehcenter_aus
@@ -796,12 +796,12 @@ automation ansible:
         metadata: {}
         data: {}
         target:
-          area_id: saal1
+          area_id: saal_1
       - action: switch.turn_off
         metadata: {}
         data: {}
         target:
-          area_id: saal1
+          area_id: saal_1
     mode: single
 
   - alias: ANSIBLE_ZONE_schnackcenter_aus
@@ -852,7 +852,7 @@ automation ansible:
         metadata: {}
         data: {}
         target:
-          area_id: backcenter
+          area_id: dreckcenter
     mode: single
 
   - alias: ANSIBLE_ZONE_gehcenter_an
@@ -949,12 +949,12 @@ automation ansible:
         metadata: {}
         data: {}
         target:
-          area_id: saal1
+          area_id: saal_1
       - action: switch.turn_on
         metadata: {}
         data: {}
         target:
-          area_id: saal1
+          area_id: saal_1
     mode: single
 
   - alias: ANSIBLE_ZONE_schnackcenter_an