diff --git a/core-lightning-rtl/data/rtl/.gitkeep b/core-lightning-rtl/data/boltz/.gitkeep
similarity index 100%
rename from core-lightning-rtl/data/rtl/.gitkeep
rename to core-lightning-rtl/data/boltz/.gitkeep
diff --git a/core-lightning-rtl/docker-compose.yml b/core-lightning-rtl/docker-compose.yml
index 20f15dc..ef1b663 100644
--- a/core-lightning-rtl/docker-compose.yml
+++ b/core-lightning-rtl/docker-compose.yml
@@ -19,6 +19,27 @@ services:
       RTL_CONFIG_PATH: "/data"
       RTL_COOKIE_PATH: "/data/.cookie"
       BLOCK_EXPLORER_URL: "${APP_CORE_RTL_BLOCK_EXPLORER_URL}"
+      # Boltz
+      BOLTZ_SERVER_URL: "https://core-lightning-rtl_boltz_1:9003"
+      BOLTZ_MACAROON_PATH: "/boltz/.boltz/macaroons"
     volumes:
       - "${APP_DATA_DIR}/data/rtl:/data"
       - "${APP_CORE_LIGHTNING_DATA_DIR}:/root/.lightning:ro"
+      - "${APP_DATA_DIR}/data/boltz:/boltz:ro"
+
+  boltz:
+    image: boltz/boltz-client:2.3.9@sha256:4de5be20d3a60399005a2ac08a058eb008f42dfd7918b50fd0c315dea7799c3e
+    restart: "on-failure"
+    stop_grace_period: "1m"
+    environment:
+      HOME: "/data"
+    volumes:
+      - "${APP_DATA_DIR}/data/boltz:/data"
+      - "${APP_CORE_LIGHTNING_DATA_DIR}:/cln:ro"
+    command:
+      - --network=$APP_BITCOIN_NETWORK
+      - --cln.datadir=/cln
+      - --cln.host=$APP_CORE_LIGHTNING_DAEMON_IP
+      - --cln.port=$APP_CORE_LIGHTNING_DAEMON_GRPC_PORT
+      - --rpc.rest.host="0.0.0.0"
+      - --rpc.rest.port="9003"
diff --git a/core-lightning-rtl/umbrel-app.yml b/core-lightning-rtl/umbrel-app.yml
index 651d6ec..ae2fd9b 100644
--- a/core-lightning-rtl/umbrel-app.yml
+++ b/core-lightning-rtl/umbrel-app.yml
@@ -2,11 +2,11 @@ manifestVersion: 1.1
 id: core-lightning-rtl
 category: bitcoin
 name: Ride The Lightning (Core Lightning)
-version: "0.15.4-beta"
+version: "0.15.4-beta-boltz"
 tagline: Manage your Core Lightning node with RTL
 description: >-
   This version of RTL is specifically configured to use your Core Lightning node.
-  
+
   RTL provides a full function, device agnostic, web user interface to help
   manage lightning node operation. It enables full control over your lightning
   node with rich functionality for Bitcoin base layer and Lightning Network.
@@ -44,13 +44,11 @@ gallery:
 path: ""
 deterministicPassword: true
 releaseNotes: >-
-  - Improved authentication logic for clearer error handling and validation during login and password reset processes
+  ⚠️ Please update your Core Lightning app to the latest version available in the umbrelOS app store to ensure compatibility with this version of Ride The Lightning.
 
-  - Refined application settings handling to ensure stricter validation of access keys
+  
+  This update adds Boltz as a service, allowing users to swap in and out of the Lightning Network.
 
-  - Bug fixes
-
-
-  Full release notes can be found here: https://github.com/Ride-The-Lightning/RTL/releases
+  About Boltz: https://boltz.exchange
 submitter: Umbrel
 submission: https://github.com/getumbrel/umbrel-apps/pull/7