diff --git a/ikea_E2201-E2213_ZHA-Z2M_control-anything.yaml b/ikea_E2201-E2213_ZHA-Z2M_control-anything.yaml
index 06430f2..874dad1 100644
--- a/ikea_E2201-E2213_ZHA-Z2M_control-anything.yaml
+++ b/ikea_E2201-E2213_ZHA-Z2M_control-anything.yaml
@@ -218,9 +218,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "short_release"
-      cluster_id: 64640
       endpoint_id: 1
-      args: [0]
     id: press-dots1-zha-e2213
   - trigger: device
     domain: mqtt
@@ -233,9 +231,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "short_release"
-      cluster_id: 64640
       endpoint_id: 2
-      args: [0]
     id: press-dots2-zha-e2213
   - trigger: device
     domain: mqtt
@@ -248,9 +244,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "multi_press_complete"
-      cluster_id: 64640
       endpoint_id: 1
-      args: [0, 2]
     id: double-press-dots1-zha-e2213
   - trigger: device
     domain: mqtt
@@ -263,9 +257,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "multi_press_complete"
-      cluster_id: 64640
       endpoint_id: 2
-      args: [0, 2]
     id: double-press-dots2-zha-e2213
   - trigger: device
     domain: mqtt
@@ -278,9 +270,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "long_press"
-      cluster_id: 64640
       endpoint_id: 1
-      args: [0]
     id: hold-dots1-zha-e2213
   - trigger: device
     domain: mqtt
@@ -293,9 +283,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "long_press"
-      cluster_id: 64640
       endpoint_id: 2
-      args: [0]
     id: hold-dots2-zha-e2213
   - trigger: device
     domain: mqtt
@@ -308,9 +296,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "long_release"
-      cluster_id: 64640
       endpoint_id: 1
-      args: [0]
     id: release-hold-dots1-zha-e2213
   - trigger: device
     domain: mqtt
@@ -323,9 +309,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "long_release"
-      cluster_id: 64640
       endpoint_id: 2
-      args: [0]
     id: release-hold-dots2-zha-e2213
   - trigger: device
     domain: mqtt
diff --git a/ikea_E2201-E2213_ZHA-Z2M_control-light.yaml b/ikea_E2201-E2213_ZHA-Z2M_control-light.yaml
index 5ad8295..ce4c801 100644
--- a/ikea_E2201-E2213_ZHA-Z2M_control-light.yaml
+++ b/ikea_E2201-E2213_ZHA-Z2M_control-light.yaml
@@ -155,9 +155,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "short_release"
-      cluster_id: 64640
       endpoint_id: 1
-      args: [0]
     id: press-dots1-zha-e2213
   - trigger: device
     domain: mqtt
@@ -170,9 +168,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "short_release"
-      cluster_id: 64640
       endpoint_id: 2
-      args: [0]
     id: press-dots2-zha-e2213
   - trigger: device
     domain: mqtt
@@ -185,9 +181,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "multi_press_complete"
-      cluster_id: 64640
       endpoint_id: 1
-      args: [0, 2]
     id: double-press-dots1-zha-e2213
   - trigger: device
     domain: mqtt
@@ -200,9 +194,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "multi_press_complete"
-      cluster_id: 64640
       endpoint_id: 2
-      args: [0, 2]
     id: double-press-dots2-zha-e2213
   - trigger: device
     domain: mqtt
@@ -215,9 +207,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "long_press"
-      cluster_id: 64640
       endpoint_id: 1
-      args: [0]
     id: hold-dots1-zha-e2213
   - trigger: device
     domain: mqtt
@@ -230,9 +220,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "long_press"
-      cluster_id: 64640
       endpoint_id: 2
-      args: [0]
     id: hold-dots2-zha-e2213
   - trigger: device
     domain: mqtt
@@ -245,9 +233,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "long_release"
-      cluster_id: 64640
       endpoint_id: 1
-      args: [0]
     id: release-hold-dots1-zha-e2213
   - trigger: device
     domain: mqtt
@@ -260,9 +246,7 @@ triggers:
     event_data:
       device_id: !input remote_device
       command: "long_release"
-      cluster_id: 64640
       endpoint_id: 2
-      args: [0]
     id: release-hold-dots2-zha-e2213
   - trigger: device
     domain: mqtt