diff --git a/homeassistant/brands/raspberry.json b/homeassistant/brands/raspberry.json
deleted file mode 100644
index a0ec6f126992b8..00000000000000
--- a/homeassistant/brands/raspberry.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "domain": "raspberry_pi",
-  "name": "Raspberry Pi",
-  "integrations": ["rpi_camera", "rpi_power", "remote_rpi_gpio"]
-}
diff --git a/homeassistant/brands/raspberry_pi.json b/homeassistant/brands/raspberry_pi.json
new file mode 100644
index 00000000000000..a64da918ccc0dd
--- /dev/null
+++ b/homeassistant/brands/raspberry_pi.json
@@ -0,0 +1,5 @@
+{
+  "domain": "raspberry_pi",
+  "name": "Raspberry Pi",
+  "integrations": ["raspberry_pi", "rpi_camera", "rpi_power", "remote_rpi_gpio"]
+}
diff --git a/homeassistant/components/remote_rpi_gpio/manifest.json b/homeassistant/components/remote_rpi_gpio/manifest.json
index f1613b2ba6b822..64a7b0e48a8509 100644
--- a/homeassistant/components/remote_rpi_gpio/manifest.json
+++ b/homeassistant/components/remote_rpi_gpio/manifest.json
@@ -1,6 +1,6 @@
 {
   "domain": "remote_rpi_gpio",
-  "name": "remote_rpi_gpio",
+  "name": "Raspberry Pi Remote GPIO",
   "documentation": "https://www.home-assistant.io/integrations/remote_rpi_gpio",
   "requirements": ["gpiozero==1.6.2", "pigpio==1.78"],
   "codeowners": [],
diff --git a/homeassistant/generated/integrations.json b/homeassistant/generated/integrations.json
index a26114843b62b5..59caad1d5541c2 100644
--- a/homeassistant/generated/integrations.json
+++ b/homeassistant/generated/integrations.json
@@ -2057,11 +2057,6 @@
       "config_flow": true,
       "iot_class": "cloud_polling"
     },
-    "hardkernel": {
-      "name": "Hardkernel",
-      "integration_type": "hardware",
-      "config_flow": false
-    },
     "harman_kardon_avr": {
       "name": "Harman Kardon AVR",
       "integration_type": "hub",
@@ -2176,16 +2171,6 @@
       "config_flow": true,
       "iot_class": "cloud_polling"
     },
-    "homeassistant_sky_connect": {
-      "name": "Home Assistant Sky Connect",
-      "integration_type": "hardware",
-      "config_flow": false
-    },
-    "homeassistant_yellow": {
-      "name": "Home Assistant Yellow",
-      "integration_type": "hardware",
-      "config_flow": false
-    },
     "homematic": {
       "name": "Homematic",
       "integrations": {
@@ -4238,7 +4223,7 @@
       "config_flow": false,
       "iot_class": "local_polling"
     },
-    "raspberry": {
+    "raspberry_pi": {
       "name": "Raspberry Pi",
       "integrations": {
         "rpi_camera": {
@@ -4254,15 +4239,10 @@
         "remote_rpi_gpio": {
           "integration_type": "hub",
           "iot_class": "local_push",
-          "name": "remote_rpi_gpio"
+          "name": "Raspberry Pi Remote GPIO"
         }
       }
     },
-    "raspberry_pi": {
-      "name": "Raspberry Pi",
-      "integration_type": "hardware",
-      "config_flow": false
-    },
     "raspyrfm": {
       "name": "RaspyRFM",
       "integration_type": "hub",
@@ -6183,7 +6163,6 @@
       "iot_class": "local_push"
     }
   },
-  "hardware": {},
   "helper": {
     "counter": {
       "name": "Counter",
diff --git a/script/hassfest/config_flow.py b/script/hassfest/config_flow.py
index 0e055e6976853e..9cebb37d3717bb 100644
--- a/script/hassfest/config_flow.py
+++ b/script/hassfest/config_flow.py
@@ -104,7 +104,11 @@ def _populate_brand_integrations(
     brand_metadata.setdefault("integrations", {})
     for domain in sub_integrations:
         integration = integrations.get(domain)
-        if not integration or integration.integration_type in ("entity", "system"):
+        if not integration or integration.integration_type in (
+            "entity",
+            "hardware",
+            "system",
+        ):
             continue
         metadata = {
             "integration_type": integration.integration_type,
@@ -131,7 +135,6 @@ def _generate_integrations(
 
     result = {
         "integration": {},
-        "hardware": {},
         "helper": {},
         "translated_name": set(),
     }
@@ -176,7 +179,7 @@ def _generate_integrations(
             result["integration"][domain] = metadata
         else:  # integration
             integration = integrations[domain]
-            if integration.integration_type in ("entity", "system"):
+            if integration.integration_type in ("entity", "system", "hardware"):
                 continue
 
             if integration.translated_name: