diff --git a/source/_dashboards/button.markdown b/source/_dashboards/button.markdown
index 9a1f9bd9a18..e4c8ab6769b 100644
--- a/source/_dashboards/button.markdown
+++ b/source/_dashboards/button.markdown
@@ -130,7 +130,7 @@ show_state: false
 tap_action:
   action: call-service
   service: script.turn_on
-  service_data:
+  data:
     entity_id: script.turn_off_lights
 ```
 
diff --git a/source/_dashboards/entities.markdown b/source/_dashboards/entities.markdown
index d24e7eba0b5..c013400a510 100644
--- a/source/_dashboards/entities.markdown
+++ b/source/_dashboards/entities.markdown
@@ -434,7 +434,7 @@ entities:
     tap_action:
       action: call-service
       service: light.toggle
-      service_data:
+      data:
         entity_id: light.bed_light
         transition: 10
   - type: divider
diff --git a/source/_dashboards/picture-elements.markdown b/source/_dashboards/picture-elements.markdown
index c6487822f21..8b28b1ea31d 100644
--- a/source/_dashboards/picture-elements.markdown
+++ b/source/_dashboards/picture-elements.markdown
@@ -160,7 +160,7 @@ tap_action:
       description: "Service to call (e.g., `media_player.media_play_pause`) when `action` defined as `call-service`."
       type: string
       default: none
-    service_data:
+    data:
       required: false
       description: "Service data to include (e.g., `entity_id: media_player.bedroom`) when `action` defined as `call-service`."
       type: string
@@ -254,7 +254,7 @@ service:
   required: true
   description: "`light.turn_on`"
   type: string
-service_data:
+data:
   required: false
   description: The service data to use.
   type: map
@@ -476,7 +476,7 @@ tap_action:
 hold_action:
   action: call-service
   service: light.turn_on
-  service_data:
+  data:
     entity_id: light.bed_light
     brightness_pct: 100
 ```
@@ -521,7 +521,7 @@ elements:
       top: 95%
       left: 60%
     service: homeassistant.turn_off
-    service_data:
+    data:
       entity_id: group.all_lights
   - type: icon
     icon: mdi:home
@@ -570,7 +570,7 @@ elements:
     tap_action:
       action: call-service
       service: media_player.media_play_pause
-      service_data:
+      data:
         entity_id: media_player.living_room
     image: /local/television.jpg
     filter: brightness(5%)
diff --git a/source/_dashboards/picture-entity.markdown b/source/_dashboards/picture-entity.markdown
index c916d07f368..60529b71dc4 100644
--- a/source/_dashboards/picture-entity.markdown
+++ b/source/_dashboards/picture-entity.markdown
@@ -119,7 +119,7 @@ camera_view: live
 tap_action:
   action: call-service
   service: camera.snapshot
-  service_data:
+  data:
     entity_id: camera.backdoor
     filename: '/shared/backdoor-{{ now().strftime("%Y-%m-%d-%H%M%S") }}.jpg'
 ```
diff --git a/source/_dashboards/picture.markdown b/source/_dashboards/picture.markdown
index cc297fae662..d4153c0ef77 100644
--- a/source/_dashboards/picture.markdown
+++ b/source/_dashboards/picture.markdown
@@ -70,6 +70,6 @@ image: /local/light.png
 tap_action:
   action: call-service
   service: light.toggle
-  service_data:
+  data:
     entity_id: light.ceiling_lights
 ```
diff --git a/source/_integrations/amcrest.markdown b/source/_integrations/amcrest.markdown
index f79fb9ad083..a1c2f85fc6b 100644
--- a/source/_integrations/amcrest.markdown
+++ b/source/_integrations/amcrest.markdown
@@ -289,7 +289,7 @@ elements:
     tap_action:
       action: call-service
       service: amcrest.ptz_control
-      service_data:
+      data:
         entity_id: camera.lakehouse
         movement: up
   - type: icon
@@ -301,7 +301,7 @@ elements:
     tap_action:
       action: call-service
       service: amcrest.ptz_control
-      service_data:
+      data:
         entity_id: camera.lakehouse
         movement: down
   - type: icon
@@ -313,7 +313,7 @@ elements:
     tap_action:
       action: call-service
       service: amcrest.ptz_control
-      service_data:
+      data:
         entity_id: camera.lakehouse
         movement: left
   - type: icon
@@ -325,7 +325,7 @@ elements:
     tap_action:
       action: call-service
       service: amcrest.ptz_control
-      service_data:
+      data:
         entity_id: camera.lakehouse
         movement: right
   - type: icon
@@ -337,7 +337,7 @@ elements:
     tap_action:
       action: call-service
       service: amcrest.ptz_control
-      service_data:
+      data:
         entity_id: camera.lakehouse
         movement: left_up
   - type: icon
@@ -349,7 +349,7 @@ elements:
     tap_action:
       action: call-service
       service: amcrest.ptz_control
-      service_data:
+      data:
         entity_id: camera.lakehouse
         movement: right_up
   - type: icon
@@ -361,7 +361,7 @@ elements:
     tap_action:
       action: call-service
       service: amcrest.ptz_control
-      service_data:
+      data:
         entity_id: camera.lakehouse
         movement: left_down
   - type: icon
@@ -373,7 +373,7 @@ elements:
     tap_action:
       action: call-service
       service: amcrest.ptz_control
-      service_data:
+      data:
         entity_id: camera.lakehouse
         movement: right_down
   - type: icon
@@ -385,13 +385,13 @@ elements:
     tap_action:
       action: call-service
       service: amcrest.ptz_control
-      service_data:
+      data:
         entity_id: camera.lakehouse
         movement: zoom_in
     hold_action:
       action: call-service
       service: amcrest.ptz_control
-      service_data:
+      data:
         entity_id: camera.lakehouse
         movement: zoom_out
 ```
diff --git a/source/_integrations/foscam.markdown b/source/_integrations/foscam.markdown
index 0328cdfbd98..b5de6621db3 100644
--- a/source/_integrations/foscam.markdown
+++ b/source/_integrations/foscam.markdown
@@ -70,7 +70,7 @@ elements:
     tap_action:
       action: call-service
       service: foscam.ptz
-      service_data:
+      data:
         entity_id: camera.bedroom
         movement: up
   - type: icon
@@ -82,7 +82,7 @@ elements:
     tap_action:
       action: call-service
       service: foscam.ptz
-      service_data:
+      data:
         entity_id: camera.bedroom
         movement: down
   - type: icon
@@ -94,7 +94,7 @@ elements:
     tap_action:
       action: call-service
       service: foscam.ptz
-      service_data:
+      data:
         entity_id: camera.bedroom
         movement: left
   - type: icon
@@ -106,7 +106,7 @@ elements:
     tap_action:
       action: call-service
       service: foscam.ptz
-      service_data:
+      data:
         entity_id: camera.bedroom
         movement: right
   - type: icon
@@ -118,7 +118,7 @@ elements:
     tap_action:
       action: call-service
       service: foscam.ptz
-      service_data:
+      data:
         entity_id: camera.bedroom
         movement: top_left
   - type: icon
@@ -130,7 +130,7 @@ elements:
     tap_action:
       action: call-service
       service: foscam.ptz
-      service_data:
+      data:
         entity_id: camera.bedroom
         movement: top_right
   - type: icon
@@ -142,7 +142,7 @@ elements:
     tap_action:
       action: call-service
       service: foscam.ptz
-      service_data:
+      data:
         entity_id: camera.bedroom
         movement: bottom_left
   - type: icon
@@ -154,7 +154,7 @@ elements:
     tap_action:
       action: call-service
       service: foscam.ptz
-      service_data:
+      data:
         entity_id: camera.bedroom
         movement: bottom_right
 ```
diff --git a/source/_integrations/motioneye.markdown b/source/_integrations/motioneye.markdown
index 2b57a0f32e1..c2fbeb14df4 100644
--- a/source/_integrations/motioneye.markdown
+++ b/source/_integrations/motioneye.markdown
@@ -313,7 +313,7 @@ A dashboard card with icons that will call the `action` service to send action c
         tap_action:
           action: call-service
           service: motioneye.action
-          service_data:
+          data:
             action: left
             entity_id: camera.living_room
       - entity: camera.living_room
@@ -321,7 +321,7 @@ A dashboard card with icons that will call the `action` service to send action c
         tap_action:
           action: call-service
           service: motioneye.action
-          service_data:
+          data:
             action: right
             entity_id: camera.living_room
       - entity: camera.living_room
@@ -329,7 +329,7 @@ A dashboard card with icons that will call the `action` service to send action c
         tap_action:
           action: call-service
           service: motioneye.action
-          service_data:
+          data:
             action: up
             entity_id: camera.living_room
       - entity: camera.living_room
@@ -337,7 +337,7 @@ A dashboard card with icons that will call the `action` service to send action c
         tap_action:
           action: call-service
           service: motioneye.action
-          service_data:
+          data:
             action: down
             entity_id: camera.living_room
 ```
diff --git a/source/_integrations/onkyo.markdown b/source/_integrations/onkyo.markdown
index d0e7b2b6fc6..543425f8952 100644
--- a/source/_integrations/onkyo.markdown
+++ b/source/_integrations/onkyo.markdown
@@ -146,7 +146,7 @@ script:
     alias: "Hdmi out projector"
     sequence:
       - service: media_player.onkyo_select_hdmi_output
-        service_data:
+        data:
           entity_id: media_player.onkyo
           hdmi_output: out-sub
 ```
diff --git a/source/_integrations/xbox.markdown b/source/_integrations/xbox.markdown
index 116886436b0..d0d5f44ad54 100644
--- a/source/_integrations/xbox.markdown
+++ b/source/_integrations/xbox.markdown
@@ -116,7 +116,7 @@ elements:
   - type: service-button
     title: ""
     service: remote.send_command
-    service_data:
+    data:
       entity_id: remote.xboxone_remote
       command: Up
     style:
@@ -128,7 +128,7 @@ elements:
   - type: service-button
     title: ""
     service: remote.send_command
-    service_data:
+    data:
       entity_id: remote.xboxone_remote
       command: Down
     style:
@@ -140,7 +140,7 @@ elements:
   - type: service-button
     title: ""
     service: remote.send_command
-    service_data:
+    data:
       entity_id: remote.xboxone_remote
       command: Left
     style:
@@ -152,7 +152,7 @@ elements:
   - type: service-button
     title: ""
     service: remote.send_command
-    service_data:
+    data:
       entity_id: remote.xboxone_remote
       command: Right
     style:
@@ -164,7 +164,7 @@ elements:
   - type: service-button
     title: ""
     service: remote.send_command
-    service_data:
+    data:
       entity_id: remote.xboxone_remote
       command: "A"
     style:
@@ -177,7 +177,7 @@ elements:
   - type: service-button
     title: ""
     service: remote.send_command
-    service_data:
+    data:
       entity_id: remote.xboxone_remote
       command: "X"
     style:
@@ -190,7 +190,7 @@ elements:
   - type: service-button
     title: ""
     service: remote.send_command
-    service_data:
+    data:
       entity_id: remote.xboxone_remote
       command: "B"
     style:
@@ -203,7 +203,7 @@ elements:
   - type: service-button
     title: ""
     service: remote.send_command
-    service_data:
+    data:
       entity_id: remote.xboxone_remote
       command: "Y"
     style:
@@ -216,7 +216,7 @@ elements:
   - type: service-button
     title: ""
     service: remote.toggle
-    service_data:
+    data:
       entity_id: remote.xboxone_remote
     style:
       top: 80.2%
@@ -228,7 +228,7 @@ elements:
   - type: service-button
     title: ""
     service: media_player.play_media
-    service_data:
+    data:
       entity_id: media_player.xboxone
       media_content_type: ""
       media_content_id: "Home"
diff --git a/source/_integrations/xiaomi_miio.markdown b/source/_integrations/xiaomi_miio.markdown
index 4e56625875a..a66baa19eb3 100644
--- a/source/_integrations/xiaomi_miio.markdown
+++ b/source/_integrations/xiaomi_miio.markdown
@@ -1142,7 +1142,7 @@ type: entity-button
 tap_action:
   action: call-service
   service: remote.send_command
-  service_data:
+  data:
     command: activate_towel_heater
     entity_id: remote.xiaomi_miio_ir
 hold_action:
diff --git a/source/dashboards/actions.markdown b/source/dashboards/actions.markdown
index 82ed55aa709..eb916d9b7b3 100644
--- a/source/dashboards/actions.markdown
+++ b/source/dashboards/actions.markdown
@@ -51,7 +51,7 @@ tap_action:
       description: "Service to call (e.g., `media_player.media_play_pause`) when `action` defined as `call-service`"
       type: string
       default: none
-    service_data:
+    data:
       required: false
       description: "Service data to include (e.g., `entity_id: media_player.bedroom`) when `action` defined as `call-service`"
       type: string
@@ -98,7 +98,7 @@ hold_action:
       description: "Service to call (e.g., `media_player.media_play_pause`) when `action` defined as `call-service`"
       type: string
       default: none
-    service_data:
+    data:
       required: false
       description: "Service data to include (e.g., `entity_id: media_player.bedroom`) when `action` defined as `call-service`"
       type: string
@@ -145,7 +145,7 @@ double_tap_action:
       description: "Service to call (e.g., `media_player.media_play_pause`) when `action` defined as `call-service`"
       type: string
       default: none
-    service_data:
+    data:
       required: false
       description: "Service data to include (e.g., `entity_id: media_player.bedroom`) when `action` defined as `call-service`"
       type: string