diff --git a/README.md b/README.md
index 99c0de2125..18f0c776bd 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ For a complete guide on how to get started with Bitcoin-S, see our website at [B
 In this repo, you can just run
 
 ```
-APP_PASSWORD=topsecret docker-compose up
+APP_PASSWORD=topsecret BITCOIN_S_UID="$(id -u):$(id -g)" docker-compose up
 ```
 
 which will spin up a docker environment that starts syncing the backend and will allow you to visit
@@ -112,4 +112,4 @@ See [here](https://bitcoin-s.org/docs/contributing) for more information.
 
 ### License
 
-Bitcoin-s is MIT licensed, as found in the [LICENSE](LICENSE) file.
\ No newline at end of file
+Bitcoin-s is MIT licensed, as found in the [LICENSE](LICENSE) file.
diff --git a/docker-compose.yml b/docker-compose.yml
index 27ecf304da..610f088336 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   web:
     image: bitcoinscala/wallet-server-ui:latest
-    user: "0:1000"
+    user: $BITCOIN_S_UID
     restart: on-failure
     stop_grace_period: 1m
     volumes:
@@ -24,7 +24,7 @@ services:
   walletserver:
     image: bitcoinscala/bitcoin-s-server:latest
     entrypoint: ["/opt/docker/bin/bitcoin-s-server", "--datadir", "/bitcoin-s", "--conf", "/opt/docker/docker-application.conf"]
-    user: "0:1000"
+    user: $BITCOIN_S_UID
     restart: on-failure
     volumes:
       - ./data/wallet:/bitcoin-s
@@ -40,6 +40,7 @@ services:
       BITCOIN_S_DLCNODE_TOR_CONTROL: "tor:9051"
       BITCOIN_S_DLCNODE_TOR_PASSWORD: "topsecret"
       BITCOIN_S_SERVER_RPC_PASSWORD: $APP_PASSWORD
+      DISABLE_JLINK: "1"
     ports:
       - "9999:9999"
     depends_on: