diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 413dd20f..4aad48d0 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       dockerfile: docker/btcd/Dockerfile
     volumes:
       - shared:/rpc
-      - bitcoin:/data
+      - ~/.btcd/data:/data
     environment:
       - NETWORK=testnet
     entrypoint: ["./start-btcd.sh"]
@@ -96,9 +96,6 @@ services:
     entrypoint: ["./start-sqkserver.sh"]
 
 volumes:
-  bitcoin:
-    driver: local
-
   # shared volume is needed for sharing the btcd certificate
   shared:
     driver: local
diff --git a/frontend/squeak-node-frontend/src/squeakclient/requests.js b/frontend/squeak-node-frontend/src/squeakclient/requests.js
index 363c268f..3aa3fb96 100644
--- a/frontend/squeak-node-frontend/src/squeakclient/requests.js
+++ b/frontend/squeak-node-frontend/src/squeakclient/requests.js
@@ -21,6 +21,7 @@ import {
   ConnectPeerResponse,
   DisconnectPeerResponse,
   CloseStatusUpdate,
+  NewAddressResponse
 } from "../proto/lnd_pb"
 import {
   GetSqueakProfileRequest,
@@ -73,7 +74,6 @@ import {
   DeletePeerReply,
   DeleteSqueakProfileReply,
   DeleteSqueakReply,
-  NewAddressReply,
 } from "../proto/squeak_admin_pb"
 
 
@@ -792,7 +792,7 @@ export function deleteSqueakRequest(squeakHash, handleResponse) {
 export function lndNewAddressRequest(handleResponse) {
   var request = new NewAddressRequest();
   makeRequest('lndnewaddress', request, (data) => {
-    var response = NewAddressReply.deserializeBinary(data);
+    var response = NewAddressResponse.deserializeBinary(data);
     handleResponse(response);
   });
 };
diff --git a/squeakserver/admin/squeak_admin_web_service.py b/squeakserver/admin/squeak_admin_web_service.py
index 7f80ed0a..8c726746 100644
--- a/squeakserver/admin/squeak_admin_web_service.py
+++ b/squeakserver/admin/squeak_admin_web_service.py
@@ -110,6 +110,13 @@ def create_app(handler):
             handler.handle_lnd_close_channel,
         )
 
+    @app.route('/lndnewaddress', methods=["POST"])
+    def lndnewaddress():
+        return handle_request(
+            lnd_pb2.NewAddressRequest(),
+            handler.handle_lnd_new_address,
+        )
+
     @app.route('/getfollowedsqueakdisplays', methods=["POST"])
     def getfollowedsqueakdisplays():
         return handle_request(
@@ -285,13 +292,6 @@ def create_app(handler):
             handler.handle_delete_squeak,
         )
 
-    @app.route('/lndnewaddress', methods=["POST"])
-    def lndnewaddress():
-        return handle_request(
-            squeak_admin_pb2.NewAddressRequest(),
-            handler.handle_lnd_new_address,
-        )
-
     return app