diff --git a/packages/debug.yaml b/packages/debug.yaml
index f285d54..2eca58d 100644
--- a/packages/debug.yaml
+++ b/packages/debug.yaml
@@ -5,9 +5,10 @@ text_sensor:
   - platform: debug
     reset_reason:
       name: "Reboot Reason"
+      entity_category: diagnostic
 
 sensor:
   - platform: debug
     free:
-      id: heap_free
       name: "Heap Free"
+      entity_category: diagnostic
\ No newline at end of file
diff --git a/packages/wifi-esp32.yaml b/packages/wifi-esp32.yaml
index a40e2fb..5ca05f2 100644
--- a/packages/wifi-esp32.yaml
+++ b/packages/wifi-esp32.yaml
@@ -16,6 +16,7 @@ sensor:
 
   - platform: copy
     source_id: wifi_signal_db
+    id: wifi_signal_pct
     name: WiFi Signal %
     filters:
       - lambda: return min(max(2 * (x + 100.0), 0.0), 100.0);