diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj
index b1eae1110..b57ab7cc0 100644
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="NBXplorer.Client" Version="1.0.0.12" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.1" />
     <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.2" />
-    <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.12" />
+    <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.13" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.0.0" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.0.11" />
diff --git a/BTCPayServer/DockerFile b/BTCPayServer/DockerFile
index ae8bd2ff4..6f2557721 100644
--- a/BTCPayServer/DockerFile
+++ b/BTCPayServer/DockerFile
@@ -3,9 +3,4 @@ FROM microsoft/aspnetcore:2.0.0
 WORKDIR /app
 COPY "bin/Release/netcoreapp2.0/publish" .
 
-ENV BTCPAY_POSTGRES="User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver"
-ENV BTCPAY_NETWORK="testnet"
-ENV BTCPAY_EXPLORERURL="https://nbxplorer-testnet-public.azurewebsites.net/"
-ENV BTCPAY_BIND="0.0.0.0:80"
-
 ENTRYPOINT ["dotnet", "BTCPayServer.dll"]
\ No newline at end of file
diff --git a/BTCPayServer/docker-compose.regtest.yml b/BTCPayServer/docker-compose.regtest.yml
index 472b87006..b3fe1de25 100644
--- a/BTCPayServer/docker-compose.regtest.yml
+++ b/BTCPayServer/docker-compose.regtest.yml
@@ -1,16 +1,35 @@
 version: "3"
 
 services:
-  nbxplorer:
-    image: nicolasdorier/nbxplorer
+
+  btcpayserver:
     ports: 
-      - 23001:23001
+      - 8080:49392
+    expose:
+      - "49392"
+    build:
+      context: .
+      dockerfile: DockerFile
+    environment:
+      BTCPAY_POSTGRES: "User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver"
+      BTCPAY_NETWORK: regtest
+      BTCPAY_EXPLORERURL: http://nbxplorer:32838/
+      BTCPAY_BIND: 0.0.0.0:49392
+    links:
+      - nbxplorer
+      - postgres
+
+  nbxplorer:
+    image: nicolasdorier/nbxplorer:1.0.0.12
+    expose: 
+      - "32838"
     environment:
       NBXPLORER_NETWORK: regtest
-      NBXPLORER_RPCURL: http://bitcoind:49372/
+      NBXPLORER_RPCURL: http://bitcoind:43782/
       NBXPLORER_RPCUSER: ceiwHEbqWI83
       NBXPLORER_RPCPASSWORD: DwubwWsoo3
       NBXPLORER_NODEENDPOINT: bitcoind:8332
+      NBXPLORER_BIND: 0.0.0.0:32838
       NBXPLORER_NOAUTH: 1
     links:
       - bitcoind
@@ -18,21 +37,12 @@ services:
   bitcoind:
     image: nicolasdorier/bitcoin:0.15.0.1
     environment:
-      BITCOIN_EXTRA_ARGS: "regtest=1\nrpcport=49372\nport=8332"
+      BITCOIN_EXTRA_ARGS: "regtest=1\nrpcport=43782\nport=8332"
       BITCOIN_RPC_USER: ceiwHEbqWI83
       BITCOIN_RPC_PASSWORD: DwubwWsoo3
     expose:
-      - "49372"
+      - "43782"
       - "8332"
-    ports:
-      - 49372:49372
-
-  btcpayserver:
-    ports: 
-      - 23001:23001
-    build:
-      context: .
-      dockerfile: DockerFile
   
   postgres:
     image:  postgres:9.6.5