diff --git a/production/docker/docker-compose.yml b/production/docker/docker-compose.yml
index 3c7cf48..25ab878 100644
--- a/production/docker/docker-compose.yml
+++ b/production/docker/docker-compose.yml
@@ -43,9 +43,10 @@ services:
     restart: always
 
   p2wdb:
-    build:
-      context: ./p2wdb/
-      dockerfile: Dockerfile
+    #build:
+    #  context: ./p2wdb/
+    #  dockerfile: Dockerfile
+    image: christroutner/p2wdb-bch-dex:v1.6.2
     container_name: p2wdb
     logging:
       driver: 'json-file'
@@ -65,9 +66,10 @@ services:
     restart: always
 
   bch-dex:
-    build:
-      context: ./bch-dex/
-      dockerfile: Dockerfile
+    #build:
+    #  context: ./bch-dex/
+    #  dockerfile: Dockerfile
+    image: christroutner/bch-dex:v1.6.2
     container_name: bch-dex
     logging:
       driver: 'json-file'
@@ -85,9 +87,10 @@ services:
     restart: always
 
   dex-ui:
-    build:
-      context: ./bch-dex-ui/
-      dockerfile: Dockerfile
+    #build:
+    #  context: ./bch-dex-ui/
+    #  dockerfile: Dockerfile
+    image: christroutner/bch-dex-ui:v1.6.2
     container_name: dex-ui
     environment:
       SERVER: 'http://192.168.2.3'
diff --git a/production/rpi-docker/bch-dex/Dockerfile b/production/rpi-docker/bch-dex/Dockerfile
index 434c43e..77ed09e 100644
--- a/production/rpi-docker/bch-dex/Dockerfile
+++ b/production/rpi-docker/bch-dex/Dockerfile
@@ -64,7 +64,7 @@ RUN npm install
 RUN npm run docs
 
 # Copy the wallet files
-COPY wallet.json wallet.json
+#COPY wallet.json wallet.json
 
 #VOLUME /home/safeuser/keys
 
diff --git a/production/rpi-docker/docker-compose.yml b/production/rpi-docker/docker-compose.yml
index e1b1de6..4499ffb 100644
--- a/production/rpi-docker/docker-compose.yml
+++ b/production/rpi-docker/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       - 172.17.0.1:8080:8080
     volumes:
       - ../data/go-ipfs/data:/data/ipfs
-      - ../data/go-ipfs/export:/export
+      - ../../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:
@@ -81,8 +81,8 @@ services:
       - p2wdb
     ports:
       - '5700:5700' # <host port>:<container port>
-    # volumes:
-    #   - ../data/ipfsdata:/home/safeuser/ipfs-service-provider/.ipfsdata
+    volumes:
+      - ../scripts/wallet.json:/home/safeuser/bch-dex/wallet.json
     restart: always
 
   dex-ui: