diff --git a/docker-compose-generator/docker-fragments/monero.yml b/docker-compose-generator/docker-fragments/monero.yml
index 9d07a05..5a46851 100644
--- a/docker-compose-generator/docker-fragments/monero.yml
+++ b/docker-compose-generator/docker-fragments/monero.yml
@@ -5,7 +5,16 @@ services:
     restart: unless-stopped
     container_name: btcpayserver_monerod
     image: btcpayserver/monero:0.17.2.3
-    entrypoint: monerod --rpc-bind-ip=0.0.0.0 --confirm-external-bind --rpc-bind-port=18081 --non-interactive --block-notify="/bin/sh ./scripts/notifier.sh -X GET http://btcpayserver:49392/monerolikedaemoncallback/block?cryptoCode=xmr&hash=%s" --hide-my-port --prune-blockchain --enable-dns-blocklist
+    entrypoint: monerod 
+    environment:
+      MONERO_EXTRA_ARGS: |
+        rpc-bind-ip=0.0.0.0
+        confirm-external-bind=1
+        rpc-bind-port=18081
+        non-interactive=1
+        block-notify="/bin/sh ./scripts/notifier.sh -X GET http://btcpayserver:49392/monerolikedaemoncallback/block?cryptoCode=xmr&hash=%s"
+        hide-my-port=1
+        enable-dns-blocklist=1
     expose:
       - "18081"
     volumes:
diff --git a/docker-compose-generator/docker-fragments/opt-save-storage.yml b/docker-compose-generator/docker-fragments/opt-save-storage.yml
index c972779..7522bf3 100644
--- a/docker-compose-generator/docker-fragments/opt-save-storage.yml
+++ b/docker-compose-generator/docker-fragments/opt-save-storage.yml
@@ -21,6 +21,9 @@ services:
   litecoind:
     environment:
       BITCOIN_EXTRA_ARGS: prune=100000
+  monerod:
+    environment:
+      MONERO_EXTRA_ARGS: prune-blockchain=1
   viacoind:
     environment:
       BITCOIN_EXTRA_ARGS: prune=100000