Using the new action events in Zigbee2MQTT 2.0

OK so im seeing a big problem here. The event_type attribute only changes once and does not revert back to unknown when the button is depressed. So using triggers to detect events only works if different buttons are being pressed each time, but doesnt trigger if the pressed button is same as the one pressed previously.

Im not sure how can i fix my existing automations which look like (already added attribute to event_type and sensor. to event. domain):

alias: Baby buddy buttons
description: ""
triggers:
  - entity_id:
      - event.baby_nappy_changing_button_action
    attribute: event_type
    id: wee
    to: single
    trigger: state
  - entity_id:
      - event.baby_nappy_changing_button_action
    attribute: event_type
    id: poo
    to: hold
    trigger: state
  - entity_id:
      - event.baby_nappy_changing_button_action
    attribute: event_type
    id: both
    to: double
    trigger: state
  - entity_id:
      - event.baby_bedroom_remote_action
    attribute: event_type
    id: bedroom_timer_start
    to: toggle
    trigger: state
  - entity_id:
      - event.baby_bedroom_remote_action
    attribute: event_type
    to: arrow_left_click
    id: bedroom_formula_feeding
    trigger: state
  - entity_id:
      - event.baby_bedroom_remote_action
    attribute: event_type
    to: brightness_up_click
    id: bedroom_nap
    trigger: state
  - entity_id:
      - event.baby_bedroom_remote_action
    attribute: event_type
    to: brightness_down_click
    id: bedroom_sleep
    trigger: state
  - entity_id:
      - event.baby_feeding_remote_action
    attribute: event_type
    to: toggle
    id: feeding_timer_start
    trigger: state
  - entity_id:
      - event.baby_feeding_remote_action
    attribute: event_type
    to: brightness_up_click
    id: feeding_solids
    trigger: state
  - entity_id:
      - event.baby_feeding_remote_action
    attribute: event_type
    to: brightness_down_click
    id: feeding_formula
    trigger: state
  - entity_id:
      - event.master_bedroom_baby_remote_action
    attribute: event_type
    to: toggle
    id: master_bedroom_timer_start
    trigger: state
  - entity_id:
      - event.master_bedroom_baby_remote_action
    attribute: event_type
    to: brightness_up_click
    id: master_bedroom_nap
    trigger: state
  - entity_id:
      - event.master_bedroom_baby_remote_action
    attribute: event_type
    to: brightness_down_click
    id: master_bedroom_sleep
    trigger: state
  - entity_id:
      - event.master_bedroom_baby_remote_action
    attribute: event_type
    to: arrow_left_click
    id: master_bedroom_formula
    trigger: state
  - entity_id:
      - event.master_bedroom_baby_remote_action
    attribute: event_type
    to: arrow_right_click
    id: master_bedroom_nappy
    trigger: state
conditions: []