diff --git a/circuitbreaker/data/.gitkeep b/circuitbreaker/data/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/circuitbreaker/docker-compose.yml b/circuitbreaker/docker-compose.yml
new file mode 100644
index 00000000..5e90bc4f
--- /dev/null
+++ b/circuitbreaker/docker-compose.yml
@@ -0,0 +1,18 @@
+version: "3.7"
+
+services:
+  app_proxy:
+    environment:
+      APP_HOST: circuitbreaker_web_1
+      APP_PORT: 9235
+      
+  web:
+    image: ghcr.io/lightningequipment/circuitbreaker:v0.4.1@sha256:cecd9f17ee6de44127a9cdbeb47a6cbdb63b4b720411df6e9cb51cab433219bc
+    user: "1000:1000"
+    restart: on-failure
+    stop_grace_period: 1m
+    init: true
+    volumes:
+      - ${APP_LIGHTNING_NODE_DATA_DIR}:/data/.lnd:ro
+      - ${APP_DATA_DIR}/data:/data/.circuitbreaker
+    command: [ "--configdir=/data/.circuitbreaker", "--network=${APP_BITCOIN_NETWORK}", "--lnddir=/data/.lnd",  "--rpcserver=${APP_LIGHTNING_NODE_IP}:${APP_LIGHTNING_NODE_GRPC_PORT}", "--httplisten=0.0.0.0:9235" ]
diff --git a/circuitbreaker/umbrel-app.yml b/circuitbreaker/umbrel-app.yml
new file mode 100644
index 00000000..41315a33
--- /dev/null
+++ b/circuitbreaker/umbrel-app.yml
@@ -0,0 +1,55 @@
+manifestVersion: 1
+id: circuitbreaker
+category: Lightning Node Management
+name: Circuit Breaker
+version: "v0.4.1"
+tagline: Your Lightning Node's Firewall
+description: >-
+  It allows nodes to protect themselves from being flooded with HTLCs. 
+  With circuitbreaker a maximum to the number of in-flight HTLCs can be set on a per-peer basis.
+  Known and trusted peers for example can be assigned a higher maximum, while a new channel from a previously unseen node may be limited to only a few pending HTLCs.
+  Furthermore it is possible to apply rate limits to the number of forwarded HTLCs. 
+  This offers protection against DoS/spam attacks that rely on large numbers of fast-resolving HTLCs. 
+  Rate limiting is implemented with a Token bucket. 
+  Via the UI the minimum interval between HTLCs can be specified.
+  Large numbers of HTLCs are also required for probing channel balances. 
+  Reducing the information leakage through probing could be another reason to put in place a rate limit for untrusted peers.
+  
+
+  Operating modes
+
+
+  There are multiple modes in which circuitbreaker can operate. A default mode and per-peer overrides can be configured via the web ui:
+
+  
+  - fail: Fail back HTLCs when limits are exceeded. This minimizes the lock-up of liquidity on the incoming side, but does affect your reputation as a routing node.
+
+  
+  - queue: Queue HTLCs when limits are exceeded. Items are popped from the queue when the number of pending HTLCs is below the maximum and the rate limit allows another forward. This mode penalizes upstream nodes for the bad traffic that the deliver by locking up liquidity along the route. This may push upstream nodes to install a firewall too and constrain the mishaving node.
+
+  Even in case of circuit breaker malfunction, queue mode should never cause channel force closes because of lnd's built-in protection that auto-fails HTLCs that aren't resolved.
+
+  WARNING: Auto-fail is not yet released and scheduled for lnd 0.16. With earlier lnd versions, you risk force-closes!
+
+  
+  - queue_peer_initiated: This mode is also queuing HTLCs, but only those that come in through channels for which we aren't the channel open initiator. Not being the initiator means that the remote node is carrying the cost of a potential force-closure with stuck HTLCs. For channels that we initiated, the safer fail mode is used.
+
+  WARNING: See queue mode warning.
+releaseNotes: >-
+  - Initial release on the Umbrel App Store
+developer: Joost Jager
+website: https://github.com/joostjager
+dependencies: 
+  - lightning
+repo: https://github.com/lightningequipment/circuitbreaker
+support: https://github.com/lightningequipment/circuitbreaker/issues
+port: 9235
+gallery:
+  - 1.jpg
+  - 2.jpg
+  - 3.jpg
+path: ""
+defaultUsername: ""
+defaultPassword: ""
+submitter: Joost Jager
+submission: https://github.com/getumbrel/umbrel-apps/pull/394