diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl
index 7d6fb7a..50bb462 100644
--- a/Production/nginx.tmpl
+++ b/Production/nginx.tmpl
@@ -107,6 +107,31 @@
         sub_filter 'href="../'  'href="/bluewallet_lndhub_app/';
         sub_filter 'src="/'  'src="/bluewallet_lndhub_app/';
         sub_filter_once off;
+	}
+		{{ end }}
+		{{ if (eq $serviceName "helipad") }}
+	location /helipad/ {
+		proxy_set_header Connection "";
+		proxy_set_header        Host               $host;
+		proxy_set_header        X-Real-IP          $remote_addr;
+        proxy_set_header        X-Forwarded-For    $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Host   $host:443;
+        proxy_set_header        X-Forwarded-Server $host;
+        proxy_set_header        X-Forwarded-Port   443;
+        proxy_set_header        X-Forwarded-Proto  https;
+		
+		sub_filter_once off;
+		sub_filter_types *;
+		
+		
+		
+		sub_filter 'src="/'  'src="/helipad/';
+		sub_filter 'href="/'  'href="/helipad/';
+		sub_filter '/image'  '/helipad/image';		
+		sub_filter '/pew'  '/helipad/pew';		
+		sub_filter '/boosts'  '/helipad/boosts';
+		proxy_pass http://helipad:2112/;
+
 	}
 		{{ end }}
 
diff --git a/README.md b/README.md
index 0d70e60..e5dccb9 100644
--- a/README.md
+++ b/README.md
@@ -186,6 +186,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are:
 * [opt-monero-expose](docker-compose-generator/docker-fragments/opt-monero-expose.yml) to expose monero node's RPC port at 127.0.0.1:18081 to connect your own wallet. Use f.e. ssh port forwarding to forward to your own computer.
 * [opt-add-fireflyiii](docker-compose-generator/docker-fragments/opt-add-fireflyiii.yml) ([See the documentation](docs/fireflyiii.md))
 * [opt-add-joinmarket](docker-compose-generator/docker-fragments/opt-add-joinmarket.yml) ([See the documentation](docs/joinmarket.md))
+* [opt-add-helipad](docker-compose-generator/docker-fragments/opt-add-helipad.yml) for [Podcastindex.org Helipad](https://github.com/Podcastindex-org/helipad). Requires LND.
 
 You can also create your own [custom fragments](#how-can-i-customize-the-generated-docker-compose-file).
 
diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs
index 79cdb49..37f0900 100644
--- a/contrib/DockerFileBuildHelper/Program.cs
+++ b/contrib/DockerFileBuildHelper/Program.cs
@@ -673,6 +673,20 @@ namespace DockerFileBuildHelper
                     dockerInfo.DockerFilePath = $"Dockerfile";
                     dockerInfo.GitRef = image.Tag.Replace("-path-prefix", "");
                     break;
+                case "chatwoot/chatwoot":
+                    dockerInfo.DockerFilePath = $"docker/Dockerfile";
+                    dockerInfo.DockerFilePathARM32v7 = $"docker/Dockerfile";
+                    dockerInfo.DockerFilePathARM64v8 = $"docker/Dockerfile";
+                    dockerInfo.GitLink = "https://github.com/chatwoot/chatwoot";
+                    dockerInfo.GitRef = $"{image.Tag}";
+                    break;
+                case "podcastindexorg/podcasting20-boosts":
+                    dockerInfo.DockerFilePath = $"umbrel/Dockerfile";
+                    dockerInfo.DockerFilePathARM32v7 = $"umbrel/Dockerfile";
+                    dockerInfo.DockerFilePathARM64v8 = $"umbrel/Dockerfile";
+                    dockerInfo.GitLink = "https://github.com/Podcastindex-org/helipad";
+                    dockerInfo.GitRef = $"{image.Tag}";
+                    break;
                 default:
                     if (firstTry)
                     {
diff --git a/docker-compose-generator/docker-fragments/opt-add-helipad.yml b/docker-compose-generator/docker-fragments/opt-add-helipad.yml
new file mode 100644
index 0000000..01ce99c
--- /dev/null
+++ b/docker-compose-generator/docker-fragments/opt-add-helipad.yml
@@ -0,0 +1,30 @@
+version: '3'
+
+services:
+  helipad:
+    container_name: helipad
+    image: podcastindexorg/podcasting20-helipad:v0.1.6
+    restart: unless-stopped
+    user: "root"
+    expose:
+    - 2112
+    volumes:
+    - helipad_datadir:/data
+    - lnd_bitcoin_datadir:/lnd:ro
+    environment:
+      LND_URL: "lnd_bitcoin:10009"
+      LND_ADMINMACAROON: "/lnd/admin.macaroon"
+      LND_TLSCERT: "/lnd/tls.cert"
+    links:
+      - lnd_bitcoin
+
+
+  btcpayserver:
+    environment:
+      BTCPAY_EXTERNALSERVICES: "Podcast Index Helipad:${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/helipad;"
+
+volumes:
+  helipad_datadir:
+        
+required:
+- "bitcoin-lnd"