diff --git a/package-lock.json b/package-lock.json
index 72db232..8407d10 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6953,6 +6953,8 @@
     },
     "node_modules/headless": {
       "version": "1.1.0",
+      "resolved": "https://github.com/paulkernfeld/node-headless/tarball/master",
+      "integrity": "sha512-Y+OAUntNS8dvU9cX0NHuTegMu7sDbd9KbPHF/pe9YO64UvuSE14AEKmMqzRqywQx83a3Y23inqC6iDvAd6PIYA==",
       "license": "MIT",
       "optional": true,
       "engines": {
@@ -24200,7 +24202,8 @@
       }
     },
     "headless": {
-      "version": "1.1.0",
+      "version": "https://github.com/paulkernfeld/node-headless/tarball/master",
+      "integrity": "sha512-Y+OAUntNS8dvU9cX0NHuTegMu7sDbd9KbPHF/pe9YO64UvuSE14AEKmMqzRqywQx83a3Y23inqC6iDvAd6PIYA==",
       "optional": true
     },
     "hmac-drbg": {
diff --git a/production/rpi-docker/bch-dex/Dockerfile b/production/rpi-docker/bch-dex/Dockerfile
index 77ed09e..97cfdac 100644
--- a/production/rpi-docker/bch-dex/Dockerfile
+++ b/production/rpi-docker/bch-dex/Dockerfile
@@ -72,7 +72,7 @@ RUN npm run docs
 #EXPOSE 5010
 
 # Start the application.
-COPY start-production.sh start-production.sh
+#COPY start-production.sh start-production.sh
 CMD ["./start-production.sh"]
 
 #CMD ["npm", "start"]
diff --git a/production/rpi-docker/bch-dex/start-production.sh b/production/rpi-docker/bch-dex/start-production.sh
index a4bd33a..76c42a0 100755
--- a/production/rpi-docker/bch-dex/start-production.sh
+++ b/production/rpi-docker/bch-dex/start-production.sh
@@ -24,7 +24,7 @@ export DBURL=mongodb://172.17.0.1:5666/bch-swap-service-prod
 export PORT=5700
 
 # bch-dex specific env vars
-export BCH_ENV=production
+export BCH_DEX=production
 export WEBHOOKSERVICE=http://172.17.0.1:5667/webhook
 export WEBHOOKTARGET=http://172.17.0.1:5700/p2wdb
 export APP_ID=bch-dex-test557
diff --git a/production/rpi-docker/docker-compose.yml b/production/rpi-docker/docker-compose.yml
index fefe4a8..3535b27 100644
--- a/production/rpi-docker/docker-compose.yml
+++ b/production/rpi-docker/docker-compose.yml
@@ -3,9 +3,9 @@
 version: '3.9'
 
 services:
-  mongo-p2wdb-service:
-    image: mongo:4.4
-    container_name: mongo-p2wdb-service
+  mongo-bch-dex:
+    image: mongo:4.2.0
+    container_name: mongo-bch-dex
     ports:
       - '5666:27017' # <host port>:<container port>
     volumes:
@@ -14,7 +14,7 @@ services:
     restart: always
 
   ipfs:
-    #image: ipfs/go-ipfs:v0.12.0
+    #image: ipfs/go-ipfs:v0.13.0
     image: odanado/go-ipfs:v0.11.0
     container_name: ipfs
     environment:
@@ -31,7 +31,7 @@ services:
       - 172.17.0.1:8080:8080
     volumes:
       - ../data/go-ipfs/data:/data/ipfs
-      - ../../swarm.key:/data/ipfs/swarm.key
+    #  - ../../swarm.key:/data/ipfs/swarm.key
     # https://docs.docker.com/compose/compose-file/compose-file-v3/#command
     # https://github.com/ipfs/go-ipfs/blob/91c52657166bcf86f2476926e4fe56694dc26562/Dockerfile#L115
     command:
@@ -47,7 +47,7 @@ services:
     #build:
     #  context: ./p2wdb/
     #  dockerfile: Dockerfile
-    image: christroutner/pwd-bch-dex-rpi:v1.7.1
+    image: christroutner/p2wdb-rpi-v3.0.6
     container_name: p2wdb
     environment:
       CONSUMER_URL: 'https://free-bch.fullstack.cash'
@@ -59,7 +59,7 @@ services:
         max-file: '10'
     mem_limit: 1gb
     links:
-      - mongo-p2wdb-service
+      - mongo-bch-dex
     ports:
       # <host port>:<container port>
       - 5667:5667 # REST API
@@ -67,13 +67,14 @@ services:
       #- 5669:5669 # IPFS WS Port
     volumes:
       - ../data/ipfsdata/p2wdb:/home/safeuser/ipfs-p2wdb-service/.ipfsdata/p2wdb
+      - ./p2wdb/start-production.sh:/home/safeuser/ipfs-p2wdb-service/start-production.sh
     restart: always
 
   bch-dex:
     #build:
     #  context: ./bch-dex/
     #  dockerfile: Dockerfile
-    image: christroutner/bch-dex-rpi:v1.7.1
+    image: christroutner/bch-dex-rpi:v1.8.2
     container_name: bch-dex
     environment:
       CONSUMER_URL: 'https://free-bch.fullstack.cash'
@@ -84,19 +85,20 @@ services:
         max-file: '10'
     mem_limit: 1000mb
     links:
-      - mongo-p2wdb-service
+      - mongo-bch-dex
       - p2wdb
     ports:
       - '5700:5700' # <host port>:<container port>
     volumes:
       - ../scripts/wallet.json:/home/safeuser/bch-dex/wallet.json
+      - ./bch-dex/start-production.sh:/home/safeuser/bch-dex/start-production.sh
     restart: always
 
   dex-ui:
     #build:
     #  context: ./bch-dex-ui/
     #  dockerfile: Dockerfile
-    image: christroutner/bch-dex-ui-rpi:v1.7.3
+    image: christroutner/bch-dex-ui-rpi:v1.7.4
     container_name: dex-ui
     logging:
       driver: 'json-file'
diff --git a/production/rpi-docker/p2wdb/Dockerfile b/production/rpi-docker/p2wdb/Dockerfile
index 317fc42..6bc5965 100644
--- a/production/rpi-docker/p2wdb/Dockerfile
+++ b/production/rpi-docker/p2wdb/Dockerfile
@@ -61,7 +61,7 @@ RUN npm run docs
 #EXPOSE 5010
 
 # Start the application.
-COPY start-production.sh start-production.sh
+#COPY start-production.sh start-production.sh
 CMD ["./start-production.sh"]
 
 #CMD ["npm", "start"]
diff --git a/production/rpi-docker/p2wdb/start-production.sh b/production/rpi-docker/p2wdb/start-production.sh
index 343cd66..27a70b2 100755
--- a/production/rpi-docker/p2wdb/start-production.sh
+++ b/production/rpi-docker/p2wdb/start-production.sh
@@ -42,6 +42,6 @@ export IPFS_API_PORT=5001
 export IPFS_TCP_PORT=4001
 
 # P2WDB specific env vars
-export ORBITDB_NAME=/orbitdb/zdpuAm4fPafpjs5mgbBUJV8Az7kd8Xj1ttD6M1JaAxF8RMRrw/psf-bch-p2wdb-keyvalue-v1.0.0-0004
+export ORBITDB_NAME=/orbitdb/zdpuAqNiwLiJBfbRK7uihV2hAbNSXj78ufzv5VyQb8GuvRwDh/psf-bch-p2wdb-keyvalue-v3.0.0-0001
 
 npm start
diff --git a/production/scripts/sweep-nfts.js b/production/scripts/sweep-nfts.js
index a011c77..547e7b4 100644
--- a/production/scripts/sweep-nfts.js
+++ b/production/scripts/sweep-nfts.js
@@ -74,7 +74,7 @@ async function sweepNfts () {
 
             // Wait for indexers to update.
             console.log('Waiting for indexers to update...')
-            await bchjs.Util.sleep(20000)
+            await bchjs.Util.sleep(120000)
 
             // Send NFT to root address.
             const receiver2 = [{