That would be a good idea because it has reached end of support.
Your problem is that your calendar trigger does not check for which event started.
The easiest way around this is to create a separate calendar for each type of waste collection you have. e.g
I use these in triggered template sensors but you can use them in automations too.
template:
- trigger:
- platform: calendar
event: start
entity_id: calendar.green_waste_collection
offset: -24:00:00
id: "green waste tomorrow"
- platform: calendar
event: start
entity_id: calendar.green_waste_collection
id: "green waste today"
- platform: calendar
event: end
entity_id: calendar.green_waste_collection
id: "off"
- platform: calendar
event: start
entity_id: calendar.recycling_collection
offset: -24:00:00
id: "recycling tomorrow"
- platform: calendar
event: start
entity_id: calendar.recycling_collection
id: "recycling today"
- platform: calendar
event: end
entity_id: calendar.recycling_collection
id: "off"
sensor:
- name: Garbage Collection
state: "{{ trigger.id }}"
icon: mdi:trash-can