diff --git a/.github/workflows/hassfest.yaml b/.github/workflows/hassfest.yaml
new file mode 100644
index 0000000..ad29ef3
--- /dev/null
+++ b/.github/workflows/hassfest.yaml
@@ -0,0 +1,17 @@
+name: Validate with hassfest
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 0 * * *"
+
+permissions:
+  contents: read
+
+jobs:
+  validate:
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: "actions/checkout@v4"
+      - uses: home-assistant/actions/hassfest@master
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
new file mode 100644
index 0000000..dd1511b
--- /dev/null
+++ b/.github/workflows/validate.yml
@@ -0,0 +1,21 @@
+name: Validate
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  validate-hacs:
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: HACS validation
+        uses: "hacs/action@main"
+        with:
+          category: "integration"
+          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/brands/icon.png b/custom_components/open_firenet/brand/icon.png
similarity index 100%
rename from brands/icon.png
rename to custom_components/open_firenet/brand/icon.png
diff --git a/brands/icon@2x.png b/custom_components/open_firenet/brand/icon@2x.png
similarity index 100%
rename from brands/icon@2x.png
rename to custom_components/open_firenet/brand/icon@2x.png
diff --git a/brands/logo.png b/custom_components/open_firenet/brand/logo.png
similarity index 100%
rename from brands/logo.png
rename to custom_components/open_firenet/brand/logo.png
diff --git a/brands/logo@2x.png b/custom_components/open_firenet/brand/logo@2x.png
similarity index 100%
rename from brands/logo@2x.png
rename to custom_components/open_firenet/brand/logo@2x.png
diff --git a/custom_components/open_firenet/icons.json b/custom_components/open_firenet/icons.json
index 7d94e60..814b5d3 100644
--- a/custom_components/open_firenet/icons.json
+++ b/custom_components/open_firenet/icons.json
@@ -1,14 +1,18 @@
 {
-  "entity_component": {
+  "entity": {
     "climate": {
-      "default": "mdi:fireplace-off",
-      "state": {
-        "heat": "mdi:fireplace",
-        "off": "mdi:fireplace-off"
+      "open_firenet": {
+        "default": "mdi:fireplace-off",
+        "state": {
+          "heat": "mdi:fireplace",
+          "off": "mdi:fireplace-off"
+        }
       }
     },
     "binary_sensor": {
-      "connectivity": "mdi:wifi-check"
+      "connected": {
+        "default": "mdi:wifi-check"
+      }
     }
   }
 }
diff --git a/custom_components/open_firenet/manifest.json b/custom_components/open_firenet/manifest.json
index 516cdc4..978933d 100644
--- a/custom_components/open_firenet/manifest.json
+++ b/custom_components/open_firenet/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "open_firenet",
   "name": "Open Firenet",
+  "codeowners": ["@openfirenet"],
   "config_flow": true,
   "documentation": "https://github.com/openfirenet/open-firenet-ha",
-  "issue_tracker": "https://github.com/openfirenet/open-firenet-ha/issues",
   "iot_class": "local_polling",
-  "version": "1.0.0",
-  "codeowners": ["@openfirenet"]
+  "issue_tracker": "https://github.com/openfirenet/open-firenet-ha/issues",
+  "version": "1.0.0"
 }