diff --git a/include/automations/andreas_kommer_hjem_taend_lys.yaml b/include/automations/andreas_kommer_hjem_taend_lys.yaml
index 9d7d6b0..c569633 100644
--- a/include/automations/andreas_kommer_hjem_taend_lys.yaml
+++ b/include/automations/andreas_kommer_hjem_taend_lys.yaml
@@ -48,9 +48,17 @@
               target:
                 entity_id: "{{ lights_to_turn_on }}"
 
+            - service: switch.turn_on
+              data:
+                entity_id: switch.stik_indkorsel
+
             - delay: "00:10:00"
 
             - service: light.turn_off
               target:
                 entity_id: "{{ lights_to_turn_on }}"
+
+            - service: switch.turn_off
+              data:
+                entity_id: switch.stik_indkorsel
                 
diff --git a/include/automations/lysindkorsel.yaml b/include/automations/lysindkorsel.yaml
index 34dc699..7709f5a 100644
--- a/include/automations/lysindkorsel.yaml
+++ b/include/automations/lysindkorsel.yaml
@@ -16,6 +16,9 @@
       - service: scene.turn_on
         data:
           entity_id: scene.indkorsel_bright
+      - service: switch.turn_on
+        data:
+          entity_id: switch.stik_indkorsel
           
   - alias: 'Sluk lys indkørsel når der er lys nok'
     trigger:
@@ -30,6 +33,9 @@
       - service: light.turn_off
         data:
           entity_id: light.indkorsel_2
+      - service: switch.turn_off
+        data:
+          entity_id: switch.stik_indkorsel
 
   - alias: 'Tænd lys indkørsel aften'
     trigger:
@@ -43,6 +49,9 @@
       - service: scene.turn_on
         data:
           entity_id: scene.indkorsel_bright
+      - service: switch.turn_on
+        data:
+          entity_id: switch.stik_indkorsel
 
   - alias: 'Sluk lys indkørsel aften'
     trigger:
@@ -52,6 +61,9 @@
       - service: light.turn_off
         data:
           entity_id: light.indkorsel_2
+      - service: switch.turn_off
+        data:
+          entity_id: switch.stik_indkorsel
           
 
   - alias: 'Tænd lys indkørsel ved bevægelse'
@@ -78,6 +90,9 @@
       - service: scene.turn_on
         data:
           entity_id: scene.indkorsel_bright
+      - service: switch.turn_on
+        data:
+          entity_id: switch.stik_indkorsel
 
   - alias: 'Sluk lys indkørsel 15 min efter bevægelse'
     trigger:
@@ -97,8 +112,11 @@
 #        entity_id: sun.sun
 #        state: below_horizon
     action:
-      service: light.turn_off
-      data:
-        entity_id: light.indkorsel_2
+      - service: light.turn_off
+        data:
+          entity_id: light.indkorsel_2
+      - service: switch.turn_off
+        data:
+          entity_id: switch.stik_indkorsel
             
 
diff --git a/include/automations/presence_simulation.yaml b/include/automations/presence_simulation.yaml
index 221ea75..838a9dc 100644
--- a/include/automations/presence_simulation.yaml
+++ b/include/automations/presence_simulation.yaml
@@ -54,6 +54,10 @@
                   - delay:
                       seconds: "{{ range(30,180) | random }}"
 
+            - service: switch.turn_on
+              data:
+                entity_id: switch.stik_indkorsel
+
             - delay:
                 minutes: "{{ range(10,30) | random }}"
 
@@ -66,6 +70,10 @@
                   - delay:
                       seconds: "{{ range(20,120) | random }}"
 
+            - service: switch.turn_off
+              data:
+                entity_id: switch.stik_indkorsel
+
             - choose:
                 - conditions:
                     - condition: template
@@ -146,6 +154,10 @@
                   - delay:
                       seconds: "{{ range(20,120) | random }}"
 
+            - service: switch.turn_on
+              data:
+                entity_id: switch.stik_indkorsel
+
             - delay:
                 minutes: "{{ range(15,60) | random }}"
 
@@ -158,6 +170,10 @@
                   - delay:
                       seconds: "{{ range(20,120) | random }}"
 
+            - service: switch.turn_off
+              data:
+                entity_id: switch.stik_indkorsel
+
             - choose:
                 - conditions:
                     - condition: template
diff --git a/include/lights/grupper.yaml b/include/lights/grupper.yaml
index 59b93d2..8f7f228 100644
--- a/include/lights/grupper.yaml
+++ b/include/lights/grupper.yaml
@@ -105,7 +105,6 @@
   name: Indkørsel
   unique_id: lys_indkorsel  
   entities:
-    - light.indkorsel_plug
     - light.udendors_forgang
     - light.hue_ambiance_lamp_1_2
     - light.hue_ambiance_lamp_1_3
@@ -116,7 +115,6 @@
   unique_id: lys_udenfor  
   entities:
     - light.garage
-    - light.indkorsel_plug
     - light.fordoer
     - light.julelys