diff --git a/homeassistant/components/my_pv/number.py b/homeassistant/components/my_pv/number.py
index 5be764bc28e8..c811d13fc8ab 100644
--- a/homeassistant/components/my_pv/number.py
+++ b/homeassistant/components/my_pv/number.py
@@ -20,10 +20,12 @@ from .entity import MyPVSetupEntity
 NUMBER_DESCRIPTIONS: Final[dict[str, dict[str, Any]]] = {
     "bsttemp": {
         "device_class": NumberDeviceClass.TEMPERATURE,
+        "entity_category": EntityCategory.CONFIG,
         "translation_key": "ww1boost",
     },
     "ww1boost": {
         "device_class": NumberDeviceClass.TEMPERATURE,
+        "entity_category": EntityCategory.CONFIG,
         "translation_key": "ww1boost",
     },
     "ww_boost_h": {
diff --git a/homeassistant/components/my_pv/select.py b/homeassistant/components/my_pv/select.py
index 3240b624379a..72439fbef913 100644
--- a/homeassistant/components/my_pv/select.py
+++ b/homeassistant/components/my_pv/select.py
@@ -28,7 +28,6 @@ async def async_setup_entry(
             key="bstmode",
             entity_category=EntityCategory.CONFIG,
             translation_key="bstmode",
-            entity_registry_enabled_default=False,
             options=list(config.get("options", {}).keys()),
         )
         entities.append(
diff --git a/homeassistant/components/my_pv/switch.py b/homeassistant/components/my_pv/switch.py
index 71a7da70c579..e461b5405b76 100644
--- a/homeassistant/components/my_pv/switch.py
+++ b/homeassistant/components/my_pv/switch.py
@@ -7,6 +7,7 @@ from homeassistant.components.switch import (
     SwitchEntity,
     SwitchEntityDescription,
 )
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -29,6 +30,7 @@ async def async_setup_entry(
     if config and config.get("type") == "boolean":
         entity_description = SwitchEntityDescription(
             key="bstmode",
+            entity_category=EntityCategory.CONFIG,
             device_class=SwitchDeviceClass.SWITCH,
             translation_key="bstmode",
         )
diff --git a/tests/components/my_pv/snapshots/test_number.ambr b/tests/components/my_pv/snapshots/test_number.ambr
index 03e198d80e3c..99b76a732b8a 100644
--- a/tests/components/my_pv/snapshots/test_number.ambr
+++ b/tests/components/my_pv/snapshots/test_number.ambr
@@ -17,7 +17,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'number',
-    'entity_category': None,
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
     'entity_id': 'number.my_pv_ac_elwa_2_boost_target_temperature',
     'has_entity_name': True,
     'hidden_by': None,
@@ -78,7 +78,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'number',
-    'entity_category': None,
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
     'entity_id': 'number.my_pv_ac_elwa_2_boost_target_temperature_2',
     'has_entity_name': True,
     'hidden_by': None,
diff --git a/tests/components/my_pv/snapshots/test_switch.ambr b/tests/components/my_pv/snapshots/test_switch.ambr
index 53bdd89ca241..e3483e359c78 100644
--- a/tests/components/my_pv/snapshots/test_switch.ambr
+++ b/tests/components/my_pv/snapshots/test_switch.ambr
@@ -12,7 +12,7 @@
     'device_id': <ANY>,
     'disabled_by': None,
     'domain': 'switch',
-    'entity_category': None,
+    'entity_category': <EntityCategory.CONFIG: 'config'>,
     'entity_id': 'switch.my_pv_ac_elwa_2_boost_mode',
     'has_entity_name': True,
     'hidden_by': None,