diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 177fab984b8791ca8e1d243b6ee2afa2b3cae7dc..e5fa957cd0b43d4a9fba0cccb260828c2e6e6510 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ build_test:
     - ln -s "$(pwd)" ${APP_PATH}
     - cd ${APP_PATH}
     - make get
-    - make standalone
+    - make bitmaskd
     - make build
   tags:
     - linux
diff --git a/Makefile b/Makefile
index 9c86e073f6cbfa564c6839d5bdbb9fa337d35a55..066028f1faa6cf3da396c5ba2fdbce711911ce5a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all get build standalone icon locales generate_locales clean
+.PHONY: all get build build_bitmaskd icon locales generate_locales clean
 
 TAGS ?= gtk_3_18
 
@@ -6,7 +6,7 @@ all: icon locales get build
 
 get:
 	go get -tags $(TAGS) ./...
-	go get -tags "$(TAGS) standalone" ./...
+	go get -tags "$(TAGS) bitmaskd" ./...
 
 build:
 	go build -tags $(TAGS) -ldflags "-X main.version=`git describe --tags`"
@@ -14,11 +14,11 @@ build:
 test:
 	go test -tags $(TAGS) ./...
 
-standalone:
-	go build -tags "$(TAGS) standalone" -ldflags "-X main.version=`git describe --tags`"
+build_bitmaskd:
+	go build -tags "$(TAGS) bitmaskd" -ldflags "-X main.version=`git describe --tags`"
 
 build_win:
-	powershell -Command '$$version=git describe --tags; go build -tags "standalone" -ldflags "-H windowsgui -X main.version=$$version"'
+	powershell -Command '$$version=git describe --tags; go build -ldflags "-H windowsgui -X main.version=$$version"'
 
 clean:
 	make -C icon clean
diff --git a/README.md b/README.md
index a6f8839435485edb9623ea7d52df2c672f0a7821..280b975dcdbba0a2a7b51c35898ce59fdd741b32 100644
--- a/README.md
+++ b/README.md
@@ -50,24 +50,29 @@ They are expected and don't produce any problem on the systray.
 
 Run it
 -------------
-bitmask-systray assumes that you already have bitmaskd running.
+The default build is a standalone systray. It still requires a helper and openvpn installed to work. For linux the helper is
+[bitmask-root](https://0xacab.org/leap/bitmask-dev/blob/master/src/leap/bitmask/vpn/helpers/linux/bitmask-root)
+for windows and OSX there is [a helper written in go](https://0xacab.org/leap/riseup_vpn/tree/master/helper).
 
-Run bitmask and the systray:
+To build and run it:
 ```
-  $ bitmaskd
+  $ go build
   $ ./bitmask-systray
 ```
 
-Standalone
+
+Bitmaskd
 -------------
+Is also posible to compile the systray to use bitmask as backend:
+```
+  $ go build -tags bitmaskd
+```
 
-Is also posible to compile the systray to be standalone (don't depend on bitmask):
+In that case bitmask-systray assumes that you already have bitmaskd running. Run bitmask and the systray:
 ```
-  $ go build -tags standalone
+  $ bitmaskd
+  $ ./bitmask-systray
 ```
-It still requires a helper and openvpn installed to work. For linux the helper is
-[bitmask-root](https://0xacab.org/leap/bitmask-dev/blob/master/src/leap/bitmask/vpn/helpers/linux/bitmask-root)
-for windows and OSX there is [a helper written in go](https://0xacab.org/leap/riseup_vpn/tree/master/helper).
 
 
 i18n
diff --git a/bitmaskd.go b/bitmaskd.go
index d9f8ff0cecea95f9bfe476a2a0ab728e0b28d891..b7036a60f408fd63609c24b48cd1b5566ca117ea 100644
--- a/bitmaskd.go
+++ b/bitmaskd.go
@@ -1,4 +1,4 @@
-// +build !standalone
+// +build bitmaskd
 // Copyright (C) 2018 LEAP
 //
 // This program is free software: you can redistribute it and/or modify
diff --git a/standalone.go b/standalone.go
index a9f135d4014ec9f30d5c6e81db71f303674e2729..e2c9f66dd6d97951a67d729baa29a0f26609749d 100644
--- a/standalone.go
+++ b/standalone.go
@@ -1,4 +1,4 @@
-// +build standalone
+// +build !bitmaskd
 // Copyright (C) 2018 LEAP
 //
 // This program is free software: you can redistribute it and/or modify