diff --git a/base.yaml b/base.yaml
index 30d668566eea57900371c1c5b3a732920cb47836..23171ee766b2a72b10922557a98e230b5e825acd 100644
--- a/base.yaml
+++ b/base.yaml
@@ -43,33 +43,14 @@ web_server:
   local: true
   # include_internal: true
 
-prometheus:
-  include_internal: true
-  filters:
-    map:
-      - Wifi Signal -> RSSI
-      - wifi_signal -> rssi
-      - Device Uptime -> Uptime
-      - device_uptime -> uptime
-      - "Status: Light -> Light"
-      - status_light -> light
-      - "Status: Fan -> Fan"
-      - status_fan -> fan
-      - "Sensor: Temperature -> Temperature"
-      - sensor_temperature -> temperature
-      - "Sensor: Humidity -> Humidity"
-      - sensor_humidity -> humidity
-      - "Sensor: Pressure -> Pressure"
-      - sensor_pressure -> pressure
-      - "Sensor: Water Temperature -> Temperature Water"
-      - sensor_water_temperature -> temperature_water
-
 sensor:
   - platform: wifi_signal
+    id: rssi
     name: "Wifi Signal"
     update_interval: 60s
 
   - platform: uptime
+    id: device_uptime
     name: "Device Uptime"
     update_interval: 60s
 
diff --git a/propbox-fan.yaml b/propbox-fan.yaml
index 067d45777c9a99b8cefb1602a4cbdd087dec92ae..65c1d7a36f5bea000935a060160d3467f3650607 100644
--- a/propbox-fan.yaml
+++ b/propbox-fan.yaml
@@ -8,4 +8,7 @@ substitutions:
 packages:
   device_base: !include base.yaml
 
+prometheus:
+  include_internal: true
+
 <<: !include include/nous_a1t.yaml
diff --git a/propbox-light.yaml b/propbox-light.yaml
index 7d7f34463a0b7fce78e5376fe8c2b4d10fe50f7c..121a904da7cb2c9b9a74c9b91e1ee9a79333897c 100644
--- a/propbox-light.yaml
+++ b/propbox-light.yaml
@@ -8,4 +8,7 @@ substitutions:
 packages:
   device_base: !include base.yaml
 
+prometheus:
+  include_internal: true
+
 <<: !include include/nous_a1t.yaml
diff --git a/propbox.yaml b/propbox.yaml
index 58edc5ebbf3a55fae0c454ccb5ef222630183ea1..a90679ad0ffd435b7919420f3a73c646a4e1f611 100644
--- a/propbox.yaml
+++ b/propbox.yaml
@@ -35,6 +35,34 @@ http_request:
   useragent: esphome/${devicename}
   timeout: 10s
 
+prometheus:
+  include_internal: true
+  relabel:
+    rssi:
+      id: rssi
+      name: RSSI
+    device_uptime:
+      id: uptime
+      name: Uptime
+    propbox_light:
+      id: light
+      name: Light
+    propbox_fan:
+      id: fan
+      name: Fan
+    temperature:
+      id: temperature
+      name: Temperature
+    humidity:
+      id: humidity
+      name: Humidity
+    pressure:
+      id: pressure
+      name: Pressure
+    temperature_water:
+      id: temperature_water
+      name: "Temperature Water"
+
 sensor:
   - platform: bme280
     address: 0x76