diff --git a/chantools/data/.gitkeep b/chantools/data/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/chantools/docker-compose.yml b/chantools/docker-compose.yml
new file mode 100644
index 00000000..c30428bb
--- /dev/null
+++ b/chantools/docker-compose.yml
@@ -0,0 +1,24 @@
+version: "3.7"
+
+services:
+  app_proxy:
+    environment:
+      APP_HOST: chantools_chantools_1
+      APP_PORT: 7682
+
+  chantools:
+    image: guggero/chantools:v0.14.1-umbrel@sha256:8994745086ab1708205f030f70e37dcfbe57154c72f27782089b229069fd8043
+    user: "1000:1000"
+    restart: on-failure
+    stop_grace_period: 1s
+    volumes:
+      - ${APP_DATA_DIR}/data:/chantools
+      - ${UMBREL_ROOT}/app-data/lightning/data/lnd:/lnd:ro
+    command:
+      - "ttyd"
+      - "-W"
+      - "-p"
+      - "7682"
+      - "bash"
+      - "-c"
+      - "/bash-wrapper.sh"
diff --git a/chantools/umbrel-app.yml b/chantools/umbrel-app.yml
new file mode 100644
index 00000000..32213e6f
--- /dev/null
+++ b/chantools/umbrel-app.yml
@@ -0,0 +1,36 @@
+manifestVersion: 1
+id: chantools
+category: bitcoin
+name: chantools CLI
+version: "v1.14.1"
+tagline: lnd and cln channel rescue utility
+description: >-
+  chantools is a command line interface (CLI) utility designed to help
+  Lightning Network node operators rescue their funds after experiencing data
+  loss.
+  
+  
+  You might want to visit https://www.node-recovery.com/chantools for more
+  information about what commands to run and how to compose those commands.
+  
+  
+  Also, you don't have to run chantools on Umbrel specifically. You can download
+  and run it on any machine, there is no direct interaction with your Lightning
+  node required and for most commands you don't even need anything other than
+  your seed phrase.
+developer: guggero
+website: https://github.com/lightninglabs/chantools
+dependencies: []
+repo: https://github.com/lightninglabs/chantools
+support: https://github.com/lightninglabs/chantools/issues
+port: 7682
+gallery:
+  - 1.jpg
+  - 2.jpg
+  - 3.jpg
+path: ""
+defaultUsername: ""
+defaultPassword: ""
+releaseNotes: ""
+submitter: guggero
+submission: https://github.com/getumbrel/umbrel-apps/pull/3849