diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl
index f86b5b5..4c595ae 100644
--- a/Production/nginx.tmpl
+++ b/Production/nginx.tmpl
@@ -159,6 +159,12 @@
   }
   {{ end }}
 
+  {{ if (eq $serviceName "torq") }}
+  location /torq/ {
+    proxy_pass http://torq:8080/;
+  }
+  {{ end }}
+
   {{ if (eq $serviceName "sphinxrelay") }}
   location /sphinxrelay/ {
     proxy_set_header        Host               $host;
diff --git a/README.md b/README.md
index 3199bd5..59d9023 100644
--- a/README.md
+++ b/README.md
@@ -193,6 +193,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are:
 * [opt-add-helipad](docker-compose-generator/docker-fragments/opt-add-helipad.yml) for [Podcastindex.org Helipad](https://github.com/Podcastindex-org/helipad). Requires LND.
 * [opt-add-nostr-relay](docker-compose-generator/docker-fragments/opt-add-nostr-relay.yml) for [Nostr Relay](https://github.com/kukks/Nnostr).
 * [opt-add-cloudflared](docker-compose-generator/docker-fragments/opt-add-cloudflared.yml) to expose your local server on clearnet painlessly ([see documentation](docs/cloudflare-tunnel.md)).
+* [opt-add-torq](docker-compose-generator/docker-fragments/opt-add-torq.yml) to install [Torq](https://github.com/lncapital/torq) node management application. Requires LND.
 
 You can also create your own [custom fragments](#how-can-i-customize-the-generated-docker-compose-file).
 
@@ -400,6 +401,8 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | djbooth007/tallycoin_connect | v1.7.5 | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile) | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile.arm64v8) | [Github](https://github.com/djbooth007/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/djbooth007/tallycoin_connect) |
 | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) |
 | apotdevin/thunderhub | base-v0.13.11 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.11/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.11/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.11/Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) |
+| lncapital/torq | 0.12.1 | [✔️](https://raw.githubusercontent.com/lncapital/torq/v0.12.1/Dockerfile) | [✔️](https://raw.githubusercontent.com/lncapital/torq/v0.12.1/Dockerfile) | [✔️](https://raw.githubusercontent.com/lncapital/torq/v0.12.1/Dockerfile) | [Github](https://github.com/lncapital/torq) - [DockerHub](https://hub.docker.com/r/lncapital/torq) |
+| timescale/timescaledb | latest-pg14 | [✔️](https://raw.githubusercontent.com/timescale/timescaledb-docker/main/Dockerfile) | [✔️](https://raw.githubusercontent.com/timescale/timescaledb-docker/main/Dockerfile) | [✔️](https://raw.githubusercontent.com/timescale/timescaledb-docker/main/Dockerfile) | [Github](https://github.com/timescale/timescaledb-docker) - [DockerHub](https://hub.docker.com/r/timescale/timescaledb) |
 | zammad/zammad-docker-compose | zammad-postgresql-3.4.0-4 | [✔️](https://raw.githubusercontent.com/zammad/zammad-docker-compose/ff20084ce2829486076e9781fe27407ca6cc09bb/containers/zammad-postgresql/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/zammad/zammad-docker-compose) - [DockerHub](https://hub.docker.com/r/zammad/zammad-docker-compose) |
 | memcached | 1.5.22-alpine | [✔️](https://raw.githubusercontent.com/docker-library/memcached/master/alpine/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/memcached) - [DockerHub](https://hub.docker.com/_/memcached) |
 | traefik | v2.6 | [✔️](https://raw.githubusercontent.com/containous/traefik-library-image/master/scratch/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/containous/traefik-library-image) - [DockerHub](https://hub.docker.com/_/traefik) |
diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs
index 5b1dae5..bc51e06 100644
--- a/contrib/DockerFileBuildHelper/Program.cs
+++ b/contrib/DockerFileBuildHelper/Program.cs
@@ -718,6 +718,20 @@ namespace DockerFileBuildHelper
                     dockerInfo.GitLink = "https://github.com/mempool/mempool";
                     dockerInfo.GitRef = image.Tag;
                     break;
+                case "lncapital/torq":
+                    dockerInfo.DockerFilePath = $"Dockerfile";
+                    dockerInfo.DockerFilePathARM32v7 = $"Dockerfile";
+                    dockerInfo.DockerFilePathARM64v8 = $"Dockerfile";
+                    dockerInfo.GitLink = "https://github.com/lncapital/torq";
+                    dockerInfo.GitRef = "v" + image.Tag;
+                    break;
+                case "timescale/timescaledb":
+                    dockerInfo.DockerFilePath = $"Dockerfile";
+                    dockerInfo.DockerFilePathARM32v7 = $"Dockerfile";
+                    dockerInfo.DockerFilePathARM64v8 = $"Dockerfile";
+                    dockerInfo.GitLink = "https://github.com/timescale/timescaledb-docker";
+                    dockerInfo.GitRef = "main";
+                    break;
                 default:
                     if (firstTry)
                     {
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index c8397ae..655af97 100644
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -1004,6 +1004,35 @@ cd "$(dirname $DOCKERFILE)"
 docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.7.8" .
 cd - && cd ..
 
+# Build torq
+# https://raw.githubusercontent.com/lncapital/torq/v0.12.1/Dockerfile
+DOCKERFILE="Dockerfile"
+# https://raw.githubusercontent.com/lncapital/torq/v0.12.1/Dockerfile
+[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile"
+# https://raw.githubusercontent.com/lncapital/torq/v0.12.1/Dockerfile
+[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile"
+echo "Building lncapital/torq:v0.12.1"
+git clone https://github.com/lncapital/torq torq
+cd torq
+git checkout v0.12.1
+cd "$(dirname $DOCKERFILE)"
+docker build -f "$DOCKERFILE" -t "lncapital/torq:v0.12.1" .
+cd - && cd ..
+
+# Build timescaledb
+# https://raw.githubusercontent.com/timescale/timescaledb-docker/main/Dockerfile
+DOCKERFILE="Dockerfile"
+# https://raw.githubusercontent.com/timescale/timescaledb-docker/main/Dockerfile
+[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile"
+# https://raw.githubusercontent.com/timescale/timescaledb-docker/main/Dockerfile
+[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile"
+echo "Building timescale/timescaledb:latest-pg14"
+git clone https://github.com/timescale/timescaledb-docker timescaledb
+cd timescaledb
+git checkout main
+cd "$(dirname $DOCKERFILE)"
+docker build -f "$DOCKERFILE" -t "timescale/timescaledb:latest-pg14" .
+cd - && cd ..
 
 # Build woocommerce
 # https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/WooCommerce/3.1.0/WooCommerce/3.1.0/linuxamd64.Dockerfile
diff --git a/docker-compose-generator/docker-fragments/opt-add-torq.yml b/docker-compose-generator/docker-fragments/opt-add-torq.yml
new file mode 100644
index 0000000..5cdaa2a
--- /dev/null
+++ b/docker-compose-generator/docker-fragments/opt-add-torq.yml
@@ -0,0 +1,46 @@
+version: "3.7"
+services:
+  torq:
+    user: "root:root"
+    image: "lncapital/torq:0.12.1"
+    restart: unless-stopped
+    depends_on:
+      - "torq_db"
+    command:
+      - --db.host
+      - torq_db
+      - --db.password
+      - torq_db_password
+      - --lnd.url
+      - lnd_bitcoin:10009
+      - --lnd.macaroon-path
+      - /lnd/admin.macaroon
+      - --lnd.tls-path
+      - /lnd/tls.cert
+      - --torq.cookie-path
+      - /data/.cookie
+      - start
+    volumes:
+      - "lnd_bitcoin_datadir:/lnd:ro"
+      - "lnd_bitcoin_torq_datadir:/data"
+    links:
+      - lnd_bitcoin
+  torq_db:
+    image: "timescale/timescaledb:latest-pg14"
+    environment:
+      POSTGRES_PASSWORD: torq_db_password
+    volumes:
+      - torq_datadir:/var/lib/postgresql/data
+
+  btcpayserver:
+    environment:
+      BTCPAY_BTCEXTERNALTORQ: "server=/torq/cookie-login;cookiefile=/etc/lnd_bitcoin_torq/.cookie"
+    volumes:
+      - "lnd_bitcoin_torq_datadir:/etc/lnd_bitcoin_torq"
+
+volumes:
+  torq_datadir:
+  lnd_bitcoin_torq_datadir:
+required:
+  - "bitcoin-lnd"
+  - "opt-lnd-grpc"