diff --git a/Production-NoReverseProxy/docker-compose.btc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-clightning.yml
index c656987..18a4de4 100644
--- a/Production-NoReverseProxy/docker-compose.btc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.btc-clightning.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.21
+    image: nicolasdorier/btcpayserver:1.0.2.22
     expose:
     - "49392"
     environment:
diff --git a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
index c63f3f6..db84cf6 100644
--- a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.21
+    image: nicolasdorier/btcpayserver:1.0.2.22
     expose:
     - "49392"
     environment:
diff --git a/Production-NoReverseProxy/docker-compose.btc-ltc.yml b/Production-NoReverseProxy/docker-compose.btc-ltc.yml
index 800e8b9..967a855 100644
--- a/Production-NoReverseProxy/docker-compose.btc-ltc.yml
+++ b/Production-NoReverseProxy/docker-compose.btc-ltc.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.21
+    image: nicolasdorier/btcpayserver:1.0.2.22
     expose:
     - "49392"
     environment:
diff --git a/Production-NoReverseProxy/docker-compose.btc.yml b/Production-NoReverseProxy/docker-compose.btc.yml
index fddb829..7f5c7b4 100644
--- a/Production-NoReverseProxy/docker-compose.btc.yml
+++ b/Production-NoReverseProxy/docker-compose.btc.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.21
+    image: nicolasdorier/btcpayserver:1.0.2.22
     expose:
     - "49392"
     environment:
diff --git a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
index c110064..edd4556 100644
--- a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.21
+    image: nicolasdorier/btcpayserver:1.0.2.22
     expose:
     - "49392"
     environment:
diff --git a/Production-NoReverseProxy/docker-compose.ltc.yml b/Production-NoReverseProxy/docker-compose.ltc.yml
index f1ca2ce..806cd91 100644
--- a/Production-NoReverseProxy/docker-compose.ltc.yml
+++ b/Production-NoReverseProxy/docker-compose.ltc.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.21
+    image: nicolasdorier/btcpayserver:1.0.2.22
     expose:
     - "49392"
     environment:
diff --git a/Production/docker-compose.btc-clightning.yml b/Production/docker-compose.btc-clightning.yml
index a8d5261..cf1c323 100644
--- a/Production/docker-compose.btc-clightning.yml
+++ b/Production/docker-compose.btc-clightning.yml
@@ -46,7 +46,7 @@ services:
     - nginx-gen
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.21
+    image: nicolasdorier/btcpayserver:1.0.2.22
     expose:
     - "49392"
     environment:
diff --git a/Production/docker-compose.btc-ltc-clightning.yml b/Production/docker-compose.btc-ltc-clightning.yml
index 9800e4a..f16f115 100644
--- a/Production/docker-compose.btc-ltc-clightning.yml
+++ b/Production/docker-compose.btc-ltc-clightning.yml
@@ -46,7 +46,7 @@ services:
     - nginx-gen
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.21
+    image: nicolasdorier/btcpayserver:1.0.2.22
     expose:
     - "49392"
     environment:
diff --git a/Production/docker-compose.btc-ltc.yml b/Production/docker-compose.btc-ltc.yml
index 3b5086d..8956236 100644
--- a/Production/docker-compose.btc-ltc.yml
+++ b/Production/docker-compose.btc-ltc.yml
@@ -46,7 +46,7 @@ services:
     - nginx-gen
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.21
+    image: nicolasdorier/btcpayserver:1.0.2.22
     expose:
     - "49392"
     environment:
diff --git a/Production/docker-compose.btc.yml b/Production/docker-compose.btc.yml
index a73f190..f56ee7d 100644
--- a/Production/docker-compose.btc.yml
+++ b/Production/docker-compose.btc.yml
@@ -46,7 +46,7 @@ services:
     - nginx-gen
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.21
+    image: nicolasdorier/btcpayserver:1.0.2.22
     expose:
     - "49392"
     environment:
diff --git a/Production/docker-compose.ltc-clightning.yml b/Production/docker-compose.ltc-clightning.yml
index c78f6ff..0662a4c 100644
--- a/Production/docker-compose.ltc-clightning.yml
+++ b/Production/docker-compose.ltc-clightning.yml
@@ -46,7 +46,7 @@ services:
     - nginx-gen
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.21
+    image: nicolasdorier/btcpayserver:1.0.2.22
     expose:
     - "49392"
     environment:
diff --git a/Production/docker-compose.ltc.yml b/Production/docker-compose.ltc.yml
index 0b98355..90affee 100644
--- a/Production/docker-compose.ltc.yml
+++ b/Production/docker-compose.ltc.yml
@@ -46,7 +46,7 @@ services:
     - nginx-gen
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.21
+    image: nicolasdorier/btcpayserver:1.0.2.22
     expose:
     - "49392"
     environment:
diff --git a/build-pregen.ps1 b/build-pregen.ps1
index 0bd66e5..b8faf78 100755
--- a/build-pregen.ps1
+++ b/build-pregen.ps1
@@ -1,4 +1,7 @@
 # This script will run docker-compose-generator in a container to generate the yml files
 
 docker pull btcpayserver/docker-compose-generator
-docker run -v "$(Get-Location)\Production:/app/Production" -v "$(Get-Location)\Production-NoReverseProxy:/app/Production-NoReverseProxy" --rm btcpayserver/docker-compose-generator pregen
\ No newline at end of file
+docker run -v "$(Get-Location)\Production:/app/Production" `
+           -v "$(Get-Location)\Production-NoReverseProxy:/app/Production-NoReverseProxy" `
+           -v "$(Get-Location)\docker-compose-generator\docker-fragments:/app/docker-fragments" `
+           --rm btcpayserver/docker-compose-generator pregen
\ No newline at end of file
diff --git a/build-pregen.sh b/build-pregen.sh
index e61eb95..0e63831 100755
--- a/build-pregen.sh
+++ b/build-pregen.sh
@@ -2,4 +2,7 @@
 
 # This script will run docker-compose-generator in a container to generate the yml files
 docker pull btcpayserver/docker-compose-generator
-docker run -v "$(pwd)/Production:/app/Production" -v "$(pwd)/Production-NoReverseProxy:/app/Production-NoReverseProxy" --rm btcpayserver/docker-compose-generator pregen
\ No newline at end of file
+docker run -v "$(pwd)/Production:/app/Production" \
+           -v "$(pwd)/Production-NoReverseProxy:/app/Production-NoReverseProxy" \
+           -v "$(pwd)/docker-compose-generator/docker-fragments:/app/docker-fragments" \ 
+           --rm btcpayserver/docker-compose-generator pregen
\ No newline at end of file
diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml
index b82bbeb..6715dd1 100644
--- a/docker-compose-generator/docker-fragments/btcpayserver.yml
+++ b/docker-compose-generator/docker-fragments/btcpayserver.yml
@@ -4,7 +4,7 @@ services:
 
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.21
+    image: nicolasdorier/btcpayserver:1.0.2.22
     expose:
       - "49392"
     environment: