diff --git a/config/packages/devices/living_room/toshiba_ac.yaml b/config/packages/devices/living_room/toshiba_ac.yaml
index 9a9ce9a..f440223 100644
--- a/config/packages/devices/living_room/toshiba_ac.yaml
+++ b/config/packages/devices/living_room/toshiba_ac.yaml
@@ -45,7 +45,7 @@ input_number:
 script:
   toshiba_ac_toggle_cool:
     sequence:
-      - service_template: >-
+      - service: >-
           {% if is_state('climate.toshiba_ac', 'off') %}
             script.toshiba_ac_on_cool
           {% else %}
diff --git a/config/packages/devices/living_room/trust_remote.yaml b/config/packages/devices/living_room/trust_remote.yaml
index e330cc0..868ae92 100644
--- a/config/packages/devices/living_room/trust_remote.yaml
+++ b/config/packages/devices/living_room/trust_remote.yaml
@@ -65,7 +65,7 @@ automation:
         value_template: >
           {{ trigger.payload_json.action == "on" }}
     action:
-      - service_template: light.turn_on
+      - service: light.turn_on
         data_template:
           entity_id: >-
             {% set groupId = (trigger.payload_json.action_group % 10) %}
diff --git a/config/packages/modules/lighting/setup/tuya.yaml b/config/packages/modules/lighting/setup/tuya.yaml
index aa3d041..ba4aa32 100644
--- a/config/packages/modules/lighting/setup/tuya.yaml
+++ b/config/packages/modules/lighting/setup/tuya.yaml
@@ -76,11 +76,11 @@
 #     action:
 #       - delay: 00:00:03
 
-#       - service_template: "input_boolean.turn_{{ states('light.kitchen_main') }}"
+#       - service: "input_boolean.turn_{{ states('light.kitchen_main') }}"
 #         entity_id: input_boolean.tuya_kitchen_main_lights_state
 
-#       - service_template: "input_boolean.turn_{{ states('light.kitchen_secondary') }}"
+#       - service: "input_boolean.turn_{{ states('light.kitchen_secondary') }}"
 #         entity_id: input_boolean.tuya_kitchen_secondary_lights_state
 
-#       - service_template: "input_boolean.turn_{{ states('light.hallway_main') }}"
+#       - service: "input_boolean.turn_{{ states('light.hallway_main') }}"
 #         entity_id: input_boolean.tuya_hallway_main_lights_state
diff --git a/config/packages/modules/speech.yaml b/config/packages/modules/speech.yaml
index c8eb6cc..bf5b030 100644
--- a/config/packages/modules/speech.yaml
+++ b/config/packages/modules/speech.yaml
@@ -52,7 +52,7 @@ script:
     alias: Speech · Say discretely
     sequence:
       # Figure out whether to talk or send a text.
-      - service_template: >
+      - service: >
           {% if (is_state('media_player.master_bedroom', 'playing')
               and is_state('binary_sensor.sonos_recoverable', 'off'))
               or is_state('input_boolean.speech_notifications', 'off')
diff --git a/config/packages/modules/system.yaml b/config/packages/modules/system.yaml
index 27a7e78..c50b84b 100644
--- a/config/packages/modules/system.yaml
+++ b/config/packages/modules/system.yaml
@@ -93,6 +93,6 @@ automation:
       event_data:
         action: "call-service"
     action:
-      - service_template: "{{ trigger.event.data.service }}"
+      - service: "{{ trigger.event.data.service }}"
         data_template:
           entity_id: "{{ trigger.event.data.entity_id }}"