diff --git a/boards/m5stack-atoms3.yml b/boards/m5stack-atoms3.yml
index 4c71922..3a24cb5 100644
--- a/boards/m5stack-atoms3.yml
+++ b/boards/m5stack-atoms3.yml
@@ -37,6 +37,7 @@ light:
   - platform: status_led
     output: status_output
     name: "Status Led"
+    entity_category: diagnostic
     internal: True
 
   #G35=RGB WS2812C-2020
@@ -49,11 +50,13 @@ light:
     chipset: ws2812
     id: led
     name: "Led"
+    entity_category: diagnostic
 
 #G41=Button
 binary_sensor:
   - platform: gpio
     name: Button
+    entity_category: diagnostic
     pin:
       number: GPIO41
       inverted: true
@@ -64,4 +67,5 @@ binary_sensor:
       - delayed_off: 10ms
     on_press:
       then:
-        - logger.log: Button Pressed
+        - logger.log:
+            format: Button Pressed
diff --git a/boards/m5stack-nanoc6.yml b/boards/m5stack-nanoc6.yml
index dc5bd07..407ae7b 100644
--- a/boards/m5stack-nanoc6.yml
+++ b/boards/m5stack-nanoc6.yml
@@ -17,14 +17,10 @@ esp32:
       CONFIG_USE_MINIMAL_MDNS: y
       CONFIG_ESPTOOLPY_FLASHSIZE_4MB: y
 
-external_components:
-  # fix logger compilation error until esphome 2024.5.x is released
-  - source: github://esphome/esphome@dev
-    components: [ logger ]
-
 light:
   - platform: status_led
     name: "Status LED"
+    entity_category: diagnostic
     pin: GPIO7
 
   #G20=RGB WS2812
@@ -36,6 +32,7 @@ light:
     rmt_channel: 1
     chipset: ws2812
     name: "RGB LED"
+    entity_category: diagnostic
     power_supply: rgbpwr
 
 power_supply:
@@ -49,6 +46,7 @@ power_supply:
 binary_sensor:
   - platform: gpio
     name: Button
+    entity_category: diagnostic
     pin:
       number: GPIO9
       inverted: true