diff --git a/mainsail/config.json b/mainsail/config.json
new file mode 100644
index 0000000000..dbcb642c02
--- /dev/null
+++ b/mainsail/config.json
@@ -0,0 +1,3 @@
+{
+  "instancesDB": "browser"
+}
diff --git a/mainsail/docker-compose.yml b/mainsail/docker-compose.yml
new file mode 100644
index 0000000000..826ecd279b
--- /dev/null
+++ b/mainsail/docker-compose.yml
@@ -0,0 +1,13 @@
+version: "3.7"
+
+services:
+  app_proxy:
+    environment:
+      APP_HOST: mainsail_web_1
+      APP_PORT: 80
+  web:
+    image: ghcr.io/mainsail-crew/mainsail:sha-4c86d7c@sha256:960b63d7f1c438ab68b0add4a5eac0aa972ec29b13e3ec16ccbc2dfadf86d568
+    restart: on-failure
+    stop_grace_period: 1m
+    volumes:
+      - ${APP_DATA_DIR}/config.json:/usr/share/nginx/html/config.json:ro
diff --git a/mainsail/umbrel-app.yml b/mainsail/umbrel-app.yml
new file mode 100644
index 0000000000..b4fc753487
--- /dev/null
+++ b/mainsail/umbrel-app.yml
@@ -0,0 +1,25 @@
+manifestVersion: 1
+id: mainsail
+category: files
+name: Mainsail
+version: "2.13.1"
+tagline: UI for Klipper. Control and monitor your printer from everywhere, from any device.
+description: >-
+  Easy to use. The focus lies on both anticipating what users may need to do and ensuring that the user interface contains elements that are easily accessible, understandable, and user-friendly to make those actions easier.
+
+  Always one step ahead. We work closely with developers of other projects so that functions can already be implemented early on.
+
+  100% open source. Anyone can join, anyone can contribute.
+releaseNotes: ""
+developer: Mainsail-Crew
+website: https://docs.mainsail.xyz/
+dependencies: []
+repo: https://github.com/mainsail-crew/mainsail
+support: https://docs.mainsail.xyz/faq/getting-help
+port: 8080
+gallery: []
+path: ""
+defaultUsername: ""
+defaultPassword: ""
+submitter: Julienpeps
+submission: https://github.com/getumbrel/umbrel-apps/pull/1982