diff --git a/README.md b/README.md
index c6c1f6d0..ca35acfa 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ Tipi is a personal homeserver orchestrator. It is running docker containers unde
 - [Freshrss](https://github.com/FreshRSS/FreshRSS) - A free, self-hostable RSS aggregator
 - [Gitea](https://github.com/go-gitea/gitea) - Gitea - A painless self-hosted Git service
 - [Homarr](https://github.com/ajnart/homarr) - A homepage for your server
+- [Home Assistant](https://github.com/home-assistant/core) - Open source home automation that puts local control and privacy first
 - [Invidious](https://github.com/iv-org/invidious) - An alternative front-end to YouTube
 - [Jackett](https://github.com/Jackett/Jackett) - API Support for your favorite torrent trackers
 - [Jellyfin](https://github.com/jellyfin/jellyfin) - A media server for your home collection
@@ -40,6 +41,7 @@ Tipi is a personal homeserver orchestrator. It is running docker containers unde
 - [Vaultwarden](https://github.com/dani-garcia/vaultwarden) - Unofficial Bitwarden compatible server
 
 ## 🛠 Installation
+
 ### Installation Requirements
 - Ubuntu 18.04 LTS or higher (or Debian 10)
 
diff --git a/apps/homeassistant/config.json b/apps/homeassistant/config.json
new file mode 100644
index 00000000..ef526f63
--- /dev/null
+++ b/apps/homeassistant/config.json
@@ -0,0 +1,12 @@
+{
+  "name": "Home Assistant",
+  "available": true,
+  "port": 8123,
+  "id": "homeassistant",
+  "description": "Open source home automation that puts local control and privacy first. Powered by a worldwide community of tinkerers and DIY enthusiasts. Perfect to run on a Raspberry Pi or a local server.",
+  "short_desc": "Open source home automation that puts local control and privacy first",
+  "author": "ArneNaessens",
+  "source": "https://github.com/home-assistant/core",
+  "image": "https://avatars.githubusercontent.com/u/13844975?s=200&v=4",
+  "form_fields": {}
+}
diff --git a/apps/homeassistant/docker-compose.yml b/apps/homeassistant/docker-compose.yml
new file mode 100644
index 00000000..c17aec22
--- /dev/null
+++ b/apps/homeassistant/docker-compose.yml
@@ -0,0 +1,13 @@
+
+version: '3'
+services:
+  homeassistant:
+    container_name: homeassistant
+    image: "ghcr.io/home-assistant/home-assistant:stable"
+    volumes:
+      - ${APP_DATA_DIR}/config:/config
+    restart: unless-stopped
+    privileged: true
+    ports:
+      - ${APP_PORT}:8123
+    network_mode: host
\ No newline at end of file