diff --git a/docker-compose-generator/docker-fragments/liquid.yml b/docker-compose-generator/docker-fragments/liquid.yml
new file mode 100644
index 0000000..6f6eaee
--- /dev/null
+++ b/docker-compose-generator/docker-fragments/liquid.yml
@@ -0,0 +1,40 @@
+version: "3"
+
+services:
+  elementsd_liquid:
+      restart: unless-stopped
+      container_name: btcpayserver_elementsd_liquid
+      image: btcpayserver/elements:0.18.1.1-1
+      environment:
+        ELEMENTS_NETWORK: ${NBITCOIN_NETWORK:-regtest}
+        ELEMENTS_MAINNET_CHAIN: "liquidv1"
+        ELEMENTS_WALLETDIR: "/walletdata"
+        ELEMENTS_EXTRA_ARGS: |
+          rpcport=43782
+          rpcbind=0.0.0.0:43782
+          rpcauth=liquid:c8bf1a8961d97f224cb21224aaa8235d$$402f4a8907683d057b8c58a42940b6e54d1638322a42986ae28ebb844e603ae6
+          port=39388
+          whitelist=0.0.0.0/0
+          validatepegin=0
+      expose:
+        - "43782"
+        - "39388"
+      volumes:
+        - "elements_datadir:/data"
+        - "elements_wallet_datadir:/walletdata"
+  nbxplorer:
+      environment:
+        NBXPLORER_CHAINS: "lbtc"
+        NBXPLORER_LBTCRPCURL: http://elementsd_liquid:43782/
+        NBXPLORER_LBTCNODEENDPOINT: elementsd_liquid:39388
+        NBXPLORER_LBTCRPCUSER: "liquid"
+        NBXPLORER_LBTCRPCPASSWORD: "liquid"
+      volumes:
+        - "elements_datadir:/root/.elements"
+  btcpayserver:
+    environment:
+      BTCPAY_CHAINS: "lbtc"
+      BTCPAY_LBTCEXPLORERURL: http://nbxplorer:32838/
+volumes:
+  elements_datadir:
+  elements_wallet_datadir:
\ No newline at end of file
diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml
index 4aa3ccb..3bc95f8 100644
--- a/docker-compose-generator/docker-fragments/nbxplorer.yml
+++ b/docker-compose-generator/docker-fragments/nbxplorer.yml
@@ -4,7 +4,7 @@ services:
 
   nbxplorer:
     restart: unless-stopped
-    image: nicolasdorier/nbxplorer:2.1.5
+    image: nicolasdorier/nbxplorer:2.1.7
     expose: 
       - "32838"
     environment:
diff --git a/docker-compose-generator/docker-fragments/opt-more-memory.yml b/docker-compose-generator/docker-fragments/opt-more-memory.yml
index 02c75f6..84cf504 100644
--- a/docker-compose-generator/docker-fragments/opt-more-memory.yml
+++ b/docker-compose-generator/docker-fragments/opt-more-memory.yml
@@ -30,5 +30,9 @@ services:
     environment:
       BITCOIN_EXTRA_ARGS: |
         dbcache=1024
+  elementsd_liquid:
+    environment:
+      ELEMENTS_EXTRA_ARGS: |
+        dbcache=1024
 exclusive:
   - memory
\ No newline at end of file
diff --git a/docker-compose-generator/docker-fragments/opt-save-storage-s.yml b/docker-compose-generator/docker-fragments/opt-save-storage-s.yml
index 75c53a3..fa26878 100644
--- a/docker-compose-generator/docker-fragments/opt-save-storage-s.yml
+++ b/docker-compose-generator/docker-fragments/opt-save-storage-s.yml
@@ -28,6 +28,9 @@ services:
     environment:
       DOGECOIN_EXTRA_ARGS: prune=50000
   monacoind:
+    environment:
+      BITCOIN_EXTRA_ARGS: prune=50000  
+  elementsd_liquid:
     environment:
       BITCOIN_EXTRA_ARGS: prune=50000
 exclusive:
diff --git a/docker-compose-generator/docker-fragments/opt-save-storage-xs.yml b/docker-compose-generator/docker-fragments/opt-save-storage-xs.yml
index 23b9bad..098ff12 100644
--- a/docker-compose-generator/docker-fragments/opt-save-storage-xs.yml
+++ b/docker-compose-generator/docker-fragments/opt-save-storage-xs.yml
@@ -30,5 +30,8 @@ services:
   monacoind:
     environment:
       BITCOIN_EXTRA_ARGS: prune=25000
+  elementsd_liquid:
+    environment:
+      BITCOIN_EXTRA_ARGS: prune=25000
 exclusive:
   - pruning
\ No newline at end of file
diff --git a/docker-compose-generator/docker-fragments/opt-save-storage-xxs.yml b/docker-compose-generator/docker-fragments/opt-save-storage-xxs.yml
index e8d928e..ac529ca 100644
--- a/docker-compose-generator/docker-fragments/opt-save-storage-xxs.yml
+++ b/docker-compose-generator/docker-fragments/opt-save-storage-xxs.yml
@@ -30,5 +30,8 @@ services:
   monacoind:
     environment:
       BITCOIN_EXTRA_ARGS: prune=5000
+  elementsd_liquid:
+    environment:
+      BITCOIN_EXTRA_ARGS: prune=5000
 exclusive:
   - pruning
\ No newline at end of file
diff --git a/docker-compose-generator/docker-fragments/opt-save-storage.yml b/docker-compose-generator/docker-fragments/opt-save-storage.yml
index cb16999..a123ffa 100644
--- a/docker-compose-generator/docker-fragments/opt-save-storage.yml
+++ b/docker-compose-generator/docker-fragments/opt-save-storage.yml
@@ -30,5 +30,8 @@ services:
   monacoind:
     environment:
       BITCOIN_EXTRA_ARGS: prune=100000
+  elementsd_liquid:
+    environment:
+      BITCOIN_EXTRA_ARGS: prune=100000
 exclusive:
   - pruning
\ No newline at end of file
diff --git a/docker-compose-generator/src/CryptoDefinition.cs b/docker-compose-generator/src/CryptoDefinition.cs
index 3f5d725..baf8f32 100644
--- a/docker-compose-generator/src/CryptoDefinition.cs
+++ b/docker-compose-generator/src/CryptoDefinition.cs
@@ -99,6 +99,11 @@ namespace DockerGenerator
                 {
 	                Crypto = "xmr",
 	                CryptoFragment = "monero"
+                },
+                new CryptoDefinition()
+                {
+	                Crypto = "lbtc",
+	                CryptoFragment = "liquid"
                 }
             };
         }
diff --git a/elements-cli.ps1 b/elements-cli.ps1
new file mode 100644
index 0000000..4116d33
--- /dev/null
+++ b/elements-cli.ps1
@@ -0,0 +1 @@
+docker exec -ti btcpayserver_elementsd_liquid elements-cli -datadir="/data" $args
diff --git a/elements-cli.sh b/elements-cli.sh
new file mode 100644
index 0000000..a524aa9
--- /dev/null
+++ b/elements-cli.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker exec -ti btcpayserver_elementsd_liquid elements-cli -datadir="/data" "$@"
diff --git a/helpers.sh b/helpers.sh
index 543e88b..a3b44d0 100755
--- a/helpers.sh
+++ b/helpers.sh
@@ -17,6 +17,7 @@ install_tooling() {
                 "btcpayserver_monacoind" "monacoin-cli.sh" "Command line for your Monacoin instance" \
                 "btcpayserver_trezarcoind" "trezarcoin-cli.sh" "Command line for your Trezar instance" \
                 "btcpayserver_viacoind" "viacoin-cli.sh" "Command line for your Viacoin instance" \
+                "btcpayserver_elementsd" "elements-cli.sh" "Command line for your Elements/Liquid instance" \
                 "*" "btcpay-clean.sh" "Command line for deleting old unused docker images" \
                 "*" "btcpay-down.sh" "Command line for stopping all services related to BTCPay Server" \
                 "*" "btcpay-restart.sh" "Command line for restarting all services related to BTCPay Server" \