diff --git a/README.md b/README.md
index 54b3560..988c2d2 100644
--- a/README.md
+++ b/README.md
@@ -391,9 +391,9 @@ Note that BTCPayServer developers will not spend excessive time testing your ima
 | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) |
 | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) |
 | lightninglabs/lightning-terminal | v0.9.2-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.9.2-alpha/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.9.2-alpha/Dockerfile) | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) |
-| mempool/frontend | v2.5.0-dev1 | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/frontend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/frontend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/frontend/Dockerfile) | [Github](https://github.com/mempool/mempool) - [DockerHub](https://hub.docker.com/r/mempool/frontend) |
-| mempool/backend | v2.5.0-dev1 | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/backend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/backend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/backend/Dockerfile) | [Github](https://github.com/mempool/mempool) - [DockerHub](https://hub.docker.com/r/mempool/backend) |
-| mariadb | 10.5.8 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.5/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) |
+| mempool/frontend | v2.5.0 | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/frontend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/frontend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/frontend/Dockerfile) | [Github](https://github.com/mempool/mempool) - [DockerHub](https://hub.docker.com/r/mempool/frontend) |
+| mempool/backend | v2.5.0 | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/backend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/backend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/backend/Dockerfile) | [Github](https://github.com/mempool/mempool) - [DockerHub](https://hub.docker.com/r/mempool/backend) |
+| mariadb | 10.11 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.11/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) |
 | kukks/nnostr-relay | v0.0.15 | [✔️](https://raw.githubusercontent.com/kukks/nnostr/Relay/v0.0.15/Relay/Dockerfile) | [✔️](https://raw.githubusercontent.com/kukks/nnostr/Relay/v0.0.15/Relay/Dockerfile) | [✔️](https://raw.githubusercontent.com/kukks/nnostr/Relay/v0.0.15/Relay/Dockerfile) | [Github](https://github.com/kukks/nnostr) - [DockerHub](https://hub.docker.com/r/kukks/nnostr-relay) |
 | sphinxlightning/sphinx-relay | v2.2.9 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.9/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) |
 | djbooth007/tallycoin_connect | v1.8.0 | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.8.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.8.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.8.0/Dockerfile.arm64v8) | [Github](https://github.com/djbooth007/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/djbooth007/tallycoin_connect) |
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index d41530d..e975115 100644
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -786,46 +786,46 @@ cd - && cd ..
 
 
 # Build frontend
-# https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/frontend/Dockerfile
+# https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/frontend/Dockerfile
 DOCKERFILE="docker/frontend/Dockerfile"
-# https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/frontend/Dockerfile
+# https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/frontend/Dockerfile
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker/frontend/Dockerfile"
-# https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/frontend/Dockerfile
+# https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/frontend/Dockerfile
 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="docker/frontend/Dockerfile"
-echo "Building mempool/frontend:v2.5.0-dev1"
+echo "Building mempool/frontend:v2.5.0"
 git clone https://github.com/mempool/mempool frontend
 cd frontend
-git checkout v2.5.0-dev1
+git checkout v2.5.0
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "mempool/frontend:v2.5.0-dev1" .
+docker build -f "$DOCKERFILE" -t "mempool/frontend:v2.5.0" .
 cd - && cd ..
 
 
 # Build backend
-# https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/backend/Dockerfile
+# https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/backend/Dockerfile
 DOCKERFILE="docker/backend/Dockerfile"
-# https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/backend/Dockerfile
+# https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/backend/Dockerfile
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker/backend/Dockerfile"
-# https://raw.githubusercontent.com/mempool/mempool/v2.5.0-dev1/docker/backend/Dockerfile
+# https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/backend/Dockerfile
 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="docker/backend/Dockerfile"
-echo "Building mempool/backend:v2.5.0-dev1"
+echo "Building mempool/backend:v2.5.0"
 git clone https://github.com/mempool/mempool backend
 cd backend
-git checkout v2.5.0-dev1
+git checkout v2.5.0
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "mempool/backend:v2.5.0-dev1" .
+docker build -f "$DOCKERFILE" -t "mempool/backend:v2.5.0" .
 cd - && cd ..
 
 
 # Build mariadb
 # https://raw.githubusercontent.com/docker-library/mariadb/master/10.5/Dockerfile
-DOCKERFILE="10.5/Dockerfile"
-echo "Building mariadb:10.5.8"
+DOCKERFILE="10.11/Dockerfile"
+echo "Building mariadb:10.11"
 git clone https://github.com/docker-library/mariadb mariadb
 cd mariadb
 git checkout master
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "mariadb:10.5.8" .
+docker build -f "$DOCKERFILE" -t "mariadb:10.11" .
 cd - && cd ..
 
 
diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index 79e397a..7fedfd7 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
@@ -17,6 +17,7 @@ services:
         bitcoin-rpcconnect=bitcoind
         experimental-offers
         database-upgrade=true
+        rpc-file-mode=0666
     volumes:
       - "clightning_bitcoin_datadir:/root/.lightning"
       - "bitcoin_datadir:/etc/bitcoin"
@@ -94,6 +95,18 @@ services:
     expose:
       - "3000"
 
+  mempool_api:
+    environment:
+      LIGHTNING_ENABLED: "true"
+      LIGHTNING_BACKEND: "cln"
+      CLIGHTNING_SOCKET: "/etc/lightning/lightning-rpc"
+    volumes:
+      - "clightning_bitcoin_datadir:/etc/lightning"
+
+  mempool_web:
+    environment:
+      LIGHTNING: "true"
+
   btcpayserver:
     environment:
       BTCPAY_BTCLIGHTNING: "type=clightning;server=unix://etc/clightning_bitcoin/lightning-rpc"
diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
index 4dbb449..250a250 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
@@ -103,6 +103,21 @@ services:
     volumes:
       - "lnd_bitcoin_datadir:/lnd"
 
+  mempool_api:
+    environment:
+      LIGHTNING_ENABLED: "true"
+      LIGHTNING_BACKEND: "lnd"
+      LND_TLS_CERT_PATH: "/etc/lnd/tls.cert"
+      LND_MACAROON_PATH: "/etc/lnd/readonly.macaroon"
+      LND_REST_API_URL: "http://lnd_bitcoin:8080"
+      LND_TIMEOUT: 1000000
+    volumes:
+      - "lnd_bitcoin_datadir:/etc/lnd"
+
+  mempool_web:
+    environment:
+      LIGHTNING: "true"
+
 volumes:
   lnd_bitcoin_datadir:
   lndloop_bitcoin_datadir:
diff --git a/docker-compose-generator/docker-fragments/opt-add-mempool.yml b/docker-compose-generator/docker-fragments/opt-add-mempool.yml
index eeacf6b..d84cf59 100644
--- a/docker-compose-generator/docker-fragments/opt-add-mempool.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-mempool.yml
@@ -9,7 +9,7 @@ services:
         # Be careful if you copy the line below from the docker-compose.yml! A dollar sign is escaped.
         rpcauth=mempool:d77ee0acf132038f6aaa9d4500d745ec$$72cc78dcf18191c91d10c15ff8f7c3dbbd170c4d3107cca35d71c6bf96af2ed9
   mempool_web:
-    image: mempool/frontend:v2.5.0-dev1
+    image: mempool/frontend:v2.5.0
     restart: on-failure
     stop_grace_period: 1m
     command: "./wait-for mempool_db:3306 --timeout=720 -- nginx -g 'daemon off;'"
@@ -20,12 +20,10 @@ services:
       BACKEND_MAINNET_HTTP_HOST: "mempool_api"
 
   mempool_api:
-    image: mempool/backend:v2.5.0-dev1
+    image: mempool/backend:v2.5.0
     restart: on-failure
     stop_grace_period: 1m
     command: "./wait-for-it.sh mempool_db:3306 --timeout=720 --strict -- ./start.sh"
-    volumes:
-      - mempool_api_datadir:/backend/cache
     expose:
       - "8999"
     environment:
@@ -45,7 +43,7 @@ services:
       DATABASE_PASSWORD: "mempool"
 
   mempool_db:
-    image: mariadb:10.5.8
+    image: mariadb:10.11
     restart: on-failure
     expose:
       - "3306"
@@ -63,7 +61,6 @@ services:
 
 volumes:
   mempool_db_datadir:
-  mempool_api_datadir:
 
 required:
   - "opt-add-electrumx"