diff --git a/docker-compose.yml b/docker-compose.yml
index 8b45e3d..f40cbae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -80,7 +80,8 @@ services:
 
   homeassistant:
     container_name: HomeAssistant
-    image: homeassistant/home-assistant:0.86.2
+    # The following value is overridden in docker-compose.override.yml
+    image: homeassistant/home-assistant:override_me
     restart: always
     networks:
       - default
diff --git a/packages/coffeemaker.yaml b/packages/coffeemaker.yaml
index 8b3946b..72eb9d2 100644
--- a/packages/coffeemaker.yaml
+++ b/packages/coffeemaker.yaml
@@ -19,9 +19,9 @@ homeassistant:
       friendly_name: Slå av automatiskt
     script.cfe_off:
       <<: *common
-    automation.coffee__timer_on:
+    automation.coffee_timer_on:
       <<: *common
-    automation.coffee__auto_off:
+    automation.coffee_auto_off:
       <<: *common
 
 input_datetime:
diff --git a/packages/lights.yaml b/packages/lights.yaml
index f102533..747343c 100644
--- a/packages/lights.yaml
+++ b/packages/lights.yaml
@@ -15,7 +15,7 @@ homeassistant:
     light.sovrum3:
       <<: *grouped
 
-    light.takfläkt:
+    light.takflakt:
       <<: *common
     light.takflakt_1:
       <<: *grouped
diff --git a/packages/reminders.yaml b/packages/reminders.yaml
index 6520cb7..1666859 100644
--- a/packages/reminders.yaml
+++ b/packages/reminders.yaml
@@ -4,7 +4,7 @@ homeassistant:
       common: &common
         package: 'reminders'
 
-    automation.rem__kaffet_ar_klart:
+    automation.rem_kaffet_ar_klart:
       <<: *common
 
 automation: