diff --git a/applications-tree.json b/applications-tree.json
index 9894ee6..117a62f 100644
--- a/applications-tree.json
+++ b/applications-tree.json
@@ -4,17 +4,21 @@
             "name": "nextcloud",
             "version": "26.0"
         },
+        {
+            "name": "homeassistant",
+            "version": "latest"
+        },
         {
             "name": "guacamole",
-            "version": "15.0" 
+            "version": "15.0"
         },
         {
             "name": "bitwarden",
-            "version": "x.?" 
+            "version": "x.?"
         },
         {
             "name": "roundcube",
-            "version": "x.?" 
+            "version": "x.?"
         },
         {
             "name": "smtp_server",
diff --git a/homeassistant/domain-homeassistant.json b/homeassistant/domain-homeassistant.json
new file mode 100644
index 0000000..0ab3ed2
--- /dev/null
+++ b/homeassistant/domain-homeassistant.json
@@ -0,0 +1,60 @@
+{
+    "main": {
+        "SERVICE_NAME": "homeassistant",
+        "DOMAIN": "#HOMEASSISTANT_DOMAIN"
+    },
+    "containers": [
+        {
+            "IMAGE": "registry.format.hu/domain-check",
+            "UPDATE": "true",
+            "MEMORY": "64M",
+            "NAME": "domain_checker",
+            "ROLES": "domain_checker",
+            "NETWORK": "host",
+            "SELECTOR": "",
+            "SCALE": "0",
+            "EXTRA": "--rm --privileged",
+            "PRE_START": [],
+            "DEPEND": [],
+            "POST_START": [],
+            "CMD": "",
+            "ENVS": [
+                {
+                    "PROXY": "smarthostloadbalancer"
+                },
+                {
+                    "TARGET": "homeassistant"
+                },
+                {
+                    "PORT": "8123"
+                },
+                {
+                    "DOMAIN": "#HOMEASSISTANT_DOMAIN"
+                },
+                {
+                    "SMARTHOST_PROXY_PATH": "/smarthost-domains"
+                },
+                {
+                    "OPERATION": "CREATE"
+                }
+            ],
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/config/smarthost-domains",
+                    "DEST": "/smarthost-domains",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/homeassistant/firewall-homeassistant.json b/homeassistant/firewall-homeassistant.json
new file mode 100644
index 0000000..938023b
--- /dev/null
+++ b/homeassistant/firewall-homeassistant.json
@@ -0,0 +1,75 @@
+{
+    "main": {
+        "SERVICE_NAME": "firewalls",
+        "DOMAIN": "null"
+    },
+    "containers": [
+        {
+            "IMAGE": "registry.format.hu/firewall",
+            "NAME": "firewall",
+            "MEMORY": "64M",
+            "NETWORK": "host",
+            "SCALE": "0",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/run/",
+                    "DEST": "/run/",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/user/config/services",
+                    "DEST": "/services",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ],
+            "PORTS": [],
+            "READYNESS": [
+                {
+                    "tcp": ""
+                },
+                {
+                    "HTTP": ""
+                },
+                {
+                    "EXEC": "/ready.sh"
+                }
+            ],
+            "ENVS": [
+                {
+                    "CHAIN": "DOCKER-USER"
+                },
+                {
+                    "SOURCE": "smarthostbackend"
+                },
+                {
+                    "TARGET": "homeassistant"
+                },
+                {
+                    "TYPE": "tcp"
+                },
+                {
+                    "TARGET_PORT": "8123"
+                },
+                {
+                    "COMMENT": "proxy for homeassistant"
+                }
+            ],
+            "EXTRA": "--privileged --rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/homeassistant/service-homeassistant.json b/homeassistant/service-homeassistant.json
new file mode 100644
index 0000000..4c8d338
--- /dev/null
+++ b/homeassistant/service-homeassistant.json
@@ -0,0 +1,43 @@
+{
+    "main": {
+        "SERVICE_NAME": "homeassistant",
+        "DOMAIN": "DOMAIN"
+    },
+    "containers": [
+        {
+            "IMAGE": "ghcr.io/home-assistant/home-assistant:stable",
+            "UPDATE": "true",
+            "NAME": "homeassistant",
+            "NETWORK": "host",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/config/homeassistant/config",
+                    "DEST": "/config",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/localtime",
+                    "DEST": "/etc/localtime",
+                    "TYPE": "ro"
+                }
+            ],
+            "PORTS": [
+                {
+                    "SOURCE": "8123",
+                    "DEST": "8123",
+                    "TYPE": "tcp"
+                }
+            ],
+            "ENVS": [],
+            "EXTRA": "null",
+            "DEPEND": [],
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": [
+                "firewall-homeassistant",
+                "domain-homeassistant"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/homeassistant/template.json b/homeassistant/template.json
new file mode 100644
index 0000000..47b5f64
--- /dev/null
+++ b/homeassistant/template.json
@@ -0,0 +1,11 @@
+{
+    "name": "homeassistant",
+    "fields": [
+        {
+            "description": "Please add your homeassistant domain:",
+            "key": "HOMEASSISTANT_DOMAIN",
+            "value": "",
+            "required": "true"
+        }
+    ]
+}
\ No newline at end of file