diff --git a/include/automations/bryggerbutton.yaml b/include/automations/bryggerbutton.yaml
index 7b3aafd..5f0ff69 100644
--- a/include/automations/bryggerbutton.yaml
+++ b/include/automations/bryggerbutton.yaml
@@ -34,7 +34,10 @@
             - condition: trigger
               id: open_garage
           sequence:
-            - service: cover.open_cover
+            - condition: state
+              entity_id: binary_sensor.garageport
+              state: "off"
+            - service: cover.toggle
               target:
                 entity_id: cover.anne
 
@@ -42,7 +45,10 @@
             - condition: trigger
               id: close_garage
           sequence:
-            - service: cover.close_cover
+            - condition: state
+              entity_id: binary_sensor.garageport
+              state: "on"
+            - service: cover.toggle
               target:
                 entity_id: cover.anne
 
diff --git a/include/automations/garage_anne.yaml b/include/automations/garage_anne.yaml
index 1edc767..c3800c7 100644
--- a/include/automations/garage_anne.yaml
+++ b/include/automations/garage_anne.yaml
@@ -62,7 +62,10 @@
                   - condition: template
                     value_template: "{{ wait.trigger.event.data.action == 'CLOSE_GARAGE_ANNE' }}"
                 sequence:
-                  - service: cover.close_cover
+                  - condition: state
+                    entity_id: binary_sensor.garageport
+                    state: "on"
+                  - service: cover.toggle
                     target:
                       entity_id: cover.anne
                   - stop: "Garage lukket via notifikation"
diff --git a/include/automations/open_garage_when_car_arrives.yaml b/include/automations/open_garage_when_car_arrives.yaml
index 7040807..7b4c2e0 100644
--- a/include/automations/open_garage_when_car_arrives.yaml
+++ b/include/automations/open_garage_when_car_arrives.yaml
@@ -34,7 +34,7 @@
                 {{ state_attr('device_tracker.snowywhite_location_tracker', 'speed') not in [None, 'unknown'] }}
 
           sequence:
-            - service: cover.open_cover
+            - service: cover.toggle
               target:
                 entity_id: cover.anne
 
@@ -58,7 +58,7 @@
           sequence:
             - delay: "00:00:20"   # giver tid til at du faktisk er kørt ud
 
-            - service: cover.close_cover
+            - service: cover.toggle
               target:
                 entity_id: cover.anne