diff --git a/home-assistant-fusion-ui/data/fusion/.gitkeep b/home-assistant-fusion-ui/data/fusion/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/home-assistant-fusion-ui/docker-compose.yml b/home-assistant-fusion-ui/docker-compose.yml
new file mode 100644
index 0000000..69bbcac
--- /dev/null
+++ b/home-assistant-fusion-ui/docker-compose.yml
@@ -0,0 +1,22 @@
+version: "3.7"
+
+services:
+  # Certain api requests from Fusion do not work unless app_proxy is set with PROXY_TRUST_UPSTREAM=true
+  # app_proxy:
+  #   environment:
+  #     APP_HOST: home-assistant-fusion-ui_web_1
+  #     APP_PORT: 5050
+  #     PROXY_TRUST_UPSTREAM: "true"
+
+  web:
+    image: ghcr.io/matt8707/ha-fusion:2024.7.1@sha256:d2d3bf83c6636351852a66b6862faadfff16ea02222121bbcff2a0fbb129d1a5
+    restart: on-failure
+    user: 1000:1000
+    ports:
+      - 5023:5050
+    volumes:
+      - ${APP_DATA_DIR}/data/fusion:/app/data
+    environment:
+      HASS_URL: http://${DEVICE_DOMAIN_NAME}:8123
+    extra_hosts:
+      - "${DEVICE_DOMAIN_NAME}:${APP_HAFUSION_MACHINE_IP}"
diff --git a/home-assistant-fusion-ui/exports.sh b/home-assistant-fusion-ui/exports.sh
new file mode 100644
index 0000000..6c0ec35
--- /dev/null
+++ b/home-assistant-fusion-ui/exports.sh
@@ -0,0 +1 @@
+export APP_HAFUSION_MACHINE_IP=$(hostname -I | awk '{print $1}')
\ No newline at end of file
diff --git a/home-assistant-fusion-ui/umbrel-app.yml b/home-assistant-fusion-ui/umbrel-app.yml
new file mode 100644
index 0000000..31e375b
--- /dev/null
+++ b/home-assistant-fusion-ui/umbrel-app.yml
@@ -0,0 +1,26 @@
+manifestVersion: 1
+id: home-assistant-fusion-ui
+name: HA-Fusion
+tagline: A modern, easy-to-use and performant custom Home Assistant dashboard
+category: automation
+version: "2024.6.1"
+port: 5023
+description: >-
+  HA-Fusion (Home Assistant Fusion UI) is an alternative frontend for the Home Assistant dashboard,
+  inspired by the sleek and intuitive design of the iOS Home app. While it does not manage integrations,
+  HA-Fusion aims to provide a highly customizable and visually appealing interface for users looking
+  to enhance their Home Assistant experience.
+developer: Mattias Persson
+website: https://github.com/matt8707/ha-fusion
+repo: https://github.com/matt8707/ha-fusion
+submitter: João Victor
+submission: https://github.com/getumbrel/umbrel-apps/pull/1185
+support: https://github.com/matt8707/ha-fusion/discussions
+gallery:
+  - 1.jpg
+  - 2.jpg
+  - 3.jpg
+releaseNotes: ""
+dependencies:
+  - home-assistant
+path: ""