diff --git a/src/main/java/io/bitsquare/btc/BitcoinModule.java b/src/main/java/io/bitsquare/btc/BitcoinModule.java
index c6346f3a49..15794095bb 100644
--- a/src/main/java/io/bitsquare/btc/BitcoinModule.java
+++ b/src/main/java/io/bitsquare/btc/BitcoinModule.java
@@ -30,7 +30,7 @@ import java.util.Properties;
 
 public class BitcoinModule extends BitsquareModule {
 
-    private static final BitcoinNetwork DEFAULT_NETWORK = BitcoinNetwork.REGTEST;
+    private static final BitcoinNetwork DEFAULT_NETWORK = BitcoinNetwork.TESTNET;
 
     private final BitcoinNetwork network;
 
@@ -57,18 +57,18 @@ public class BitcoinModule extends BitsquareModule {
     }
 
     private NetworkParameters network() {
-            String networkName = properties.getProperty("networkType", network.name());
+        String networkName = properties.getProperty("networkType", network.name());
 
-            switch (BitcoinNetwork.valueOf(networkName.toUpperCase())) {
-                case MAINNET:
-                    return MainNetParams.get();
-                case TESTNET:
-                    return TestNet3Params.get();
-                case REGTEST:
-                    return RegTestParams.get();
-                default:
-                    throw new IllegalArgumentException("Unknown bitcoin network name: " + networkName);
-            }
+        switch (BitcoinNetwork.valueOf(networkName.toUpperCase())) {
+            case MAINNET:
+                return MainNetParams.get();
+            case TESTNET:
+                return TestNet3Params.get();
+            case REGTEST:
+                return RegTestParams.get();
+            default:
+                throw new IllegalArgumentException("Unknown bitcoin network name: " + networkName);
+        }
     }
 }
 
diff --git a/src/main/java/io/bitsquare/msg/MessageModule.java b/src/main/java/io/bitsquare/msg/MessageModule.java
index ce19a8aa84..351fd3a923 100644
--- a/src/main/java/io/bitsquare/msg/MessageModule.java
+++ b/src/main/java/io/bitsquare/msg/MessageModule.java
@@ -42,7 +42,7 @@ public abstract class MessageModule extends BitsquareModule {
 
         bind(Node.class)
                 .annotatedWith(Names.named("bootstrapNode"))
-                .toInstance(BootstrapNodes.LOCALHOST);
+                .toInstance(BootstrapNodes.DIGITAL_OCEAN_1);
 
         doConfigure();
     }