diff --git a/README.md b/README.md
index 95ccb5af7..9fcde7998 100644
--- a/README.md
+++ b/README.md
@@ -80,6 +80,19 @@ Python Apps and HADashboard using AppDaemon 3.x for Home Assistant
 
 [:books: AppDaemon3 add-on documentation][addon-doc-appdaemon3]
 
+### ✓ [Home Assistant Control Panel][addon-control-panel]
+
+![Latest Version][control-panel-version-shield]
+![Supports armhf Architecture][control-panel-armhf-shield]
+![Supports aarch64 Architecture][control-panel-aarch64-shield]
+![Supports amd64 Architecture][control-panel-amd64-shield]
+![Supports i386 Architecture][control-panel-i386-shield]
+![Docker Pulls][control-panel-pulls-shield]
+
+Simple to use control panel for the ultimate home automation setup
+
+[:books: Home Assistant Control Panel add-on documentation][addon-doc-control-panel]
+
 ## Releases
 
 Add-on releases are **NOT** based on [Semantic Versioning][semver], unlike
@@ -103,6 +116,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: AirCast][aircast-issue]
 - [Open an issue for the add-on: AirSonos][airsonos-issue]
 - [Open an issue for the add-on: AppDaemon3][appdaemon3-issue]
+- [Open an issue for the add-on: Home Assistant Control Panel][control-panel-issue]
 
 For a general repository issue or add-on ideas [open an issue here][issue]
 
@@ -179,6 +193,15 @@ SOFTWARE.
 [appdaemon3-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [appdaemon3-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [appdaemon3-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-control-panel]: https://github.com/hassio-addons/addon-control-panel/tree/v1.0.0
+[addon-doc-control-panel]: https://github.com/hassio-addons/addon-control-panel/blob/v1.0.0/README.md
+[control-panel-issue]: https://github.com/hassio-addons/addon-control-panel/issues
+[control-panel-version-shield]: https://img.shields.io/badge/version-v1.0.0-blue.svg
+[control-panel-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/control-panel-armhf.svg
+[control-panel-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[control-panel-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[control-panel-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[control-panel-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [awesome-shield]: https://img.shields.io/badge/awesome%3F-yes-brightgreen.svg
 [discord-shield]: https://img.shields.io/discord/330944238910963714.svg
 [discord]: https://discord.gg/c5DvZ4e
diff --git a/control-panel/CHANGELOG.md b/control-panel/CHANGELOG.md
new file mode 100644
index 000000000..be787ead0
--- /dev/null
+++ b/control-panel/CHANGELOG.md
@@ -0,0 +1 @@
+🎉  Initial release!
\ No newline at end of file
diff --git a/control-panel/config.json b/control-panel/config.json
new file mode 100644
index 000000000..20bb96804
--- /dev/null
+++ b/control-panel/config.json
@@ -0,0 +1,41 @@
+{
+  "name": "Home Assistant Control Panel",
+  "version": "1.0.0",
+  "slug": "control-panel",
+  "description": "Simple to use control panel for the ultimate home automation setup",
+  "url": "https://community.home-assistant.io/t/community-hass-io-add-on-home-assistant-control-panel/49634?u=frenck",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:7080]",
+  "startup": "system",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "i386"
+  ],
+  "boot": "auto",
+  "hassio_api": true,
+  "map": [
+    "ssl"
+  ],
+  "ports": {
+    "7080/tcp": 7080
+  },
+  "options": {
+    "log_level": "info",
+    "ssl": false,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem",
+    "ipv6": false
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str",
+    "ipv6": "bool"
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/control-panel-{arch}"
+}
\ No newline at end of file
diff --git a/control-panel/icon.png b/control-panel/icon.png
new file mode 100644
index 000000000..a7a530530
Binary files /dev/null and b/control-panel/icon.png differ
diff --git a/control-panel/logo.png b/control-panel/logo.png
new file mode 100644
index 000000000..3c7101fe6
Binary files /dev/null and b/control-panel/logo.png differ