diff --git a/source/_components/binary_sensor.apcupsd.markdown b/source/_components/binary_sensor.apcupsd.markdown
index 946c0112062..6c599b75b15 100644
--- a/source/_components/binary_sensor.apcupsd.markdown
+++ b/source/_components/binary_sensor.apcupsd.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: apcupsd.png
-ha_category: Binary Sensor
+ha_category: System Monitor
 ha_release: 0.13
 ha_iot_class: "Local Polling"
 ---
diff --git a/source/_components/sensor.apcupsd.markdown b/source/_components/sensor.apcupsd.markdown
index d7e6ae6ae36..57478d821ba 100644
--- a/source/_components/sensor.apcupsd.markdown
+++ b/source/_components/sensor.apcupsd.markdown
@@ -8,7 +8,8 @@ comments: false
 sharing: true
 footer: true
 logo: apcupsd.png
-ha_category: Sensor
+ha_release: 0.13
+ha_category: System Monitor
 ---
 
 The `apcupsd` sensor platform allows you to monitor a UPS (battery backup) by using data from the [apcaccess](http://linux.die.net/man/8/apcaccess) command.
diff --git a/source/_components/sensor.nut.markdown b/source/_components/sensor.nut.markdown
index a5a70788c28..63489b4c65c 100644
--- a/source/_components/sensor.nut.markdown
+++ b/source/_components/sensor.nut.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: nut.png
-ha_category: Sensor
+ha_category: System Monitor
 ha_version: 0.34
 ---