diff --git a/common/base.yaml b/common/base.yaml
index 1b52699..ae21971 100644
--- a/common/base.yaml
+++ b/common/base.yaml
@@ -65,14 +65,6 @@ status_led:
     inverted: true
 
 sensor:
-  # Battery level
-  - platform: adc
-    pin: _VBAT
-    name: "${node_name} VBAT Voltage"
-    attenuation: 11db
-#    filters:
-#      - lambda: return ( x/4096.0 ) * 2 * 3.42;
-    update_interval: 60s
   # WiFi signal strength
   - platform: wifi_signal
     name: "${node_name} RSSI"
diff --git a/common/battery.yaml b/common/battery.yaml
new file mode 100644
index 0000000..abb661d
--- /dev/null
+++ b/common/battery.yaml
@@ -0,0 +1,9 @@
+sensor:
+  # Battery level
+  - platform: adc
+    pin: _VBAT
+    name: "${node_name} VBAT Voltage"
+    attenuation: 11db
+#    filters:
+#      - lambda: return ( x/4096.0 ) * 2 * 3.42;
+    update_interval: 60s
diff --git a/test.yaml b/hendrik-test.yaml
similarity index 92%
rename from test.yaml
rename to hendrik-test.yaml
index 6b0b7b5..bf03923 100644
--- a/test.yaml
+++ b/hendrik-test.yaml
@@ -1,5 +1,5 @@
 substitutions:
-  node_name: thomas-test
+  node_name: hendrik-test
 
 packages:
   base: !include common/base.yaml
diff --git a/sensor-outdoor.yaml b/sensor-outdoor.yaml
new file mode 100644
index 0000000..f9fe652
--- /dev/null
+++ b/sensor-outdoor.yaml
@@ -0,0 +1,10 @@
+substitutions:
+  node_name: sensor-outdoor
+
+packages:
+  base: !include common/base.yaml
+  battery: !include common/battery.yaml
+  env_sensor: !include common/bme280.yaml
+  particulate: !include common/sds011.yaml
+  light: !include common/bh1750.yaml
+  uv: !include common/veml6075.yaml
diff --git a/sensor-springer.yaml b/sensor-springer.yaml
new file mode 100644
index 0000000..54e2164
--- /dev/null
+++ b/sensor-springer.yaml
@@ -0,0 +1,8 @@
+substitutions:
+  node_name: sensor-springer
+
+packages:
+  base: !include common/base.yaml
+  battery: !include common/battery.yaml
+  env_sensor: !include common/bme280.yaml
+
diff --git a/sensor-sz.yaml b/sensor-sz.yaml
new file mode 100644
index 0000000..ecceccb
--- /dev/null
+++ b/sensor-sz.yaml
@@ -0,0 +1,7 @@
+substitutions:
+  node_name: sensor-sz
+
+packages:
+  base: !include common/base.yaml
+  env_sensor: !include common/bme680.yaml
+  display: !include common/display.yaml
diff --git a/sensor-wz.yaml b/sensor-wz.yaml
new file mode 100644
index 0000000..d33cd6e
--- /dev/null
+++ b/sensor-wz.yaml
@@ -0,0 +1,7 @@
+substitutions:
+  node_name: sensor-wz
+
+packages:
+  base: !include common/base.yaml
+  env_sensor: !include common/bme680.yaml
+  display: !include common/display.yaml