diff --git a/bathroomheater.yaml b/bathroomheater.yaml
index 70dbcb5..8ab9e06 100644
--- a/bathroomheater.yaml
+++ b/bathroomheater.yaml
@@ -1,6 +1,7 @@
 esphome:
   name: bathroomheater
   friendly_name: "Bathroom heater"
+  area: "Bathroom"
 
   project:
     name: dasfoo.bathroomheater
diff --git a/blinds.yaml b/blinds.yaml
index 884579e..55fe113 100644
--- a/blinds.yaml
+++ b/blinds.yaml
@@ -1,6 +1,7 @@
 esphome:
   name: blinds
   friendly_name: "Blinds"
+  area: "Entryway"
 
   project:
     name: dasfoo.blinds
diff --git a/car-charger.yaml b/car-charger.yaml
index 21aca80..b3a000b 100644
--- a/car-charger.yaml
+++ b/car-charger.yaml
@@ -3,6 +3,7 @@ substitutions:
 
 esphome:
   friendly_name: "Car charger"
+  area: "Garage"
 
 packages:
   device_base: !include templates/mystrom.yaml
diff --git a/heating-eg.yaml b/heating-eg.yaml
index ea750f1..0527514 100644
--- a/heating-eg.yaml
+++ b/heating-eg.yaml
@@ -1,3 +1,12 @@
+esphome:
+  name: heating-eg
+  friendly_name: "Heating EG"
+  area: "Workshop"
+
+  project:
+    name: dasfoo.heating-eg
+    version: "1.0"
+
 esp8266:
   board: esp12e
 
@@ -15,14 +24,6 @@ status_led:
     number: GPIO5
     inverted: true
 
-esphome:
-  name: heating-eg
-  friendly_name: "Heating EG"
-
-  project:
-    name: dasfoo.heating-eg
-    version: "1.0"
-
 switch:
   # Switches in the order of relais onboard, ltr.
   # Specified onboard LED number.
diff --git a/heating-og.yaml b/heating-og.yaml
index 3133a8c..dffbac3 100644
--- a/heating-og.yaml
+++ b/heating-og.yaml
@@ -1,3 +1,12 @@
+esphome:
+  name: heating-og
+  friendly_name: "Heating OG"
+  area: "Bedroom"
+
+  project:
+    name: dasfoo.heating-og
+    version: "1.0"
+
 esp8266:
   board: esp12e
 
@@ -10,14 +19,6 @@ packages:
 
 logger:
 
-esphome:
-  name: heating-og
-  friendly_name: "Heating OG"
-
-  project:
-    name: dasfoo.heating-og
-    version: "1.0"
-
 switch:
   - platform: gpio
     pin: GPIO16
diff --git a/heating.yaml b/heating.yaml
index db345d3..724d581 100644
--- a/heating.yaml
+++ b/heating.yaml
@@ -1,6 +1,7 @@
 esphome:
   name: heating
   friendly_name: "Heating"
+  area: "Workshop"
 
   # The entire setup consists of:
   #
diff --git a/pool-pump.yaml b/pool-pump.yaml
index 3c549d5..35a9e91 100644
--- a/pool-pump.yaml
+++ b/pool-pump.yaml
@@ -3,6 +3,7 @@ substitutions:
 
 esphome:
   friendly_name: "Pool pump"
+  area: "Backyard"
 
 packages:
   device_base: !include templates/mystrom.yaml
diff --git a/recirculation-pump.yaml b/recirculation-pump.yaml
index ae159c5..1f3cbd4 100644
--- a/recirculation-pump.yaml
+++ b/recirculation-pump.yaml
@@ -3,6 +3,7 @@ substitutions:
 
 esphome:
   friendly_name: "Recirculation pump"
+  area: "Workshop"
 
 packages:
   device_base: !include templates/mystrom.yaml
diff --git a/ruuvi.yaml b/ruuvi.yaml
index 47d2ee2..cbb3254 100644
--- a/ruuvi.yaml
+++ b/ruuvi.yaml
@@ -1,6 +1,7 @@
 esphome:
   name: ruuvi
   friendly_name: "Ruuvi"
+  area: "Attic"
 
   project:
     name: dasfoo.ruuvi
diff --git a/storage-heater.yaml b/storage-heater.yaml
index 4d084a7..4bbb233 100644
--- a/storage-heater.yaml
+++ b/storage-heater.yaml
@@ -3,6 +3,7 @@ substitutions:
 
 esphome:
   friendly_name: "Storage heater"
+  area: "Storage"
 
 packages:
   device_base: !include templates/mystrom.yaml
diff --git a/watermeter.yaml b/watermeter.yaml
index a78823f..f734f8f 100644
--- a/watermeter.yaml
+++ b/watermeter.yaml
@@ -1,6 +1,7 @@
 esphome:
   name: watermeter
   friendly_name: "Water meter"
+  area: "Laundry"
 
   project:
     name: dasfoo.watermeter