diff --git a/Dockerfile b/Dockerfile
index 078970790..ae6b3c5e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-# Build wnode-status in a Go builder container
+# Build status-go in a Go builder container
 FROM golang:1.9-alpine as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers
 
 RUN mkdir -p /go/src/github.com/status-im/status-go
 ADD . /go/src/github.com/status-im/status-go
-RUN cd /go/src/github.com/status-im/status-go && make statusgo && make wnode-status
+RUN cd /go/src/github.com/status-im/status-go && make statusgo
 
 # Copy the binary to the second image
 FROM alpine:latest
diff --git a/cmd/statusd/main.go b/cmd/statusd/main.go
index 33aab27e4..677512d2a 100644
--- a/cmd/statusd/main.go
+++ b/cmd/statusd/main.go
@@ -33,7 +33,7 @@ var (
 	logLevel       = flag.String("log", "INFO", `Log level, one of: "ERROR", "WARN", "INFO", "DEBUG", and "TRACE"`)
 	logFile        = flag.String("logfile", "", "Path to the log file")
 	version        = flag.Bool("version", false, "Print version")
-	les            = flag.Bool("les", false, "LES protocol")
+	lesEnabled     = flag.Bool("les", true, "LES protocol enabled")
 
 	listenAddr = flag.String("listenaddr", ":30303", "IP address and port of this node (e.g. 127.0.0.1:30303)")
 	standalone = flag.Bool("standalone", true, "Don't actively connect to peers, wait for incoming connections")
@@ -129,7 +129,7 @@ func makeNodeConfig() (*params.NodeConfig, error) {
 	nodeConfig.HTTPPort = *httpPort
 	nodeConfig.IPCEnabled = *ipcEnabled
 
-	nodeConfig.LightEthConfig.Enabled = *les
+	nodeConfig.LightEthConfig.Enabled = *lesEnabled
 	nodeConfig.SwarmConfig.Enabled = *swarmEnabled
 
 	if *whisperEnabled {
diff --git a/cmd/statusd/whispercfg.go b/cmd/statusd/whispercfg.go
index 56e6f9648..b99b580c2 100644
--- a/cmd/statusd/whispercfg.go
+++ b/cmd/statusd/whispercfg.go
@@ -9,7 +9,7 @@ import (
 	"github.com/status-im/status-go/geth/params"
 )
 
-// makeNodeConfig creates node configuration object from flags
+// whisperConfig creates node configuration object from flags
 func whisperConfig(nodeConfig *params.NodeConfig) (*params.NodeConfig, error) {
 
 	nodeConfig.ListenAddr = *listenAddr
diff --git a/static/tests/mailserver.js b/static/tests/mailserver.js
index e2a0ff968..a4ccb90ea 100644
--- a/static/tests/mailserver.js
+++ b/static/tests/mailserver.js
@@ -13,7 +13,7 @@ describe('Whisper MailServer', () => {
 
     describe('Check prerequisites', () => {
         console.log('Expecting MailServer running.')
-        console.log('./build/bin/wnode-status -mailserver -passwordfile=./static/keys/wnodepassword -http -httpport 8540 -listenaddr=127.0.0.1:8549 -identity=./static/keys/wnodekey')
+        console.log('./build/bin/statusd -les=false -shh -shh.mailserver -passwordfile=./static/keys/wnodepassword -http -httpport 8540 -listenaddr=127.0.0.1:8549 -identity=./static/keys/wnodekey')
 
         it('MailServer should be running', () => {
             const mailServer = new Web3(new Web3.providers.HttpProvider('http://localhost:8540'));
@@ -28,8 +28,8 @@ describe('Whisper MailServer', () => {
 
         before((done) => {
             nodeAProcess = spawn(
-                './build/bin/wnode-status',
-                ['-datadir', 'wnode-data-1', '-http', '-httpport', '8590']
+                './build/bin/statusd',
+                ['-shh', '-les=false', '-datadir', 'wnode-data-1', '-http', '-httpport', '8590']
             );
             nodeA = new Web3(new Web3.providers.HttpProvider('http://localhost:8590'));
 
@@ -82,8 +82,8 @@ describe('Whisper MailServer', () => {
 
         before((done) => {
             nodeBProcess = spawn(
-                './build/bin/wnode-status',
-                ['-datadir', 'wnode-data-2', '-http', '-httpport', '8591', '-log', 'INFO', '-logfile', 'wnode-data-2/wnode.log']
+                './build/bin/statusd',
+                ['-shh', '-les=false', '-datadir', 'wnode-data-2', '-http', '-httpport', '8591', '-log', 'INFO', '-logfile', 'wnode-data-2/wnode.log']
             );
             nodeB = new Web3(new Web3.providers.HttpProvider('http://localhost:8591'));