diff --git a/hue-dimmer-blueprint.yaml b/hue-dimmer-blueprint.yaml
index 943a286..8130158 100644
--- a/hue-dimmer-blueprint.yaml
+++ b/hue-dimmer-blueprint.yaml
@@ -11,21 +11,18 @@ blueprint:
         selector:
             action:
 triggers:
-  - trigger: state
-    entity_id: "{{ var_button1 }}"
-    attribute: event_type
-    to:
-      - short_release
-      - long_press
-      - repeat
+  - event_type: state_changed
+    event_data:
+      entity_id: "{{ var_button_ch1 }}"
+    trigger: event
+    id: button1_short
 conditions: []
 actions:
   - choose:
       - conditions:
           - condition: template
             value_template: >-
-              {{ trigger.entity_id == "event.bedroom_switch_desk_button_1" and
-              trigger.to_state.attributes.event_type == "short_release"}}
+              {{ trigger.id == "button1_short"}}
         sequence: !input button1_short_press
 mode: single
 trigger_variables: