diff --git a/bitmask/darwin.go b/bitmask/darwin.go
index 88d6f8beb8a7340d7fb8d9e53654e521643326d0..32a9b079a641a3d1610e54da8ce7e4fe4434548b 100644
--- a/bitmask/darwin.go
+++ b/bitmask/darwin.go
@@ -18,4 +18,6 @@ package bitmask
 
 import "os"
 
+const coreEndpoint = "ipc:///var/tmp/bitmask.core.sock"
+
 var ConfigPath = os.Getenv("HOME") + "/Library/Preferences/leap"
diff --git a/bitmask/main.go b/bitmask/main.go
index a78ffabcd8d0f6041161361bc4dfccbc7ffa2743..a044c580113c45610392a0420f15e4e39ed7c6dd 100644
--- a/bitmask/main.go
+++ b/bitmask/main.go
@@ -18,7 +18,6 @@ package bitmask
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"log"
 	"time"
 
@@ -26,9 +25,7 @@ import (
 )
 
 const (
-	// On win should be: tcp://127.0.0.1:5001
-	coreEndpoint = "ipc://%s/bitmask.core.sock"
-	timeout      = time.Second * 15
+	timeout = time.Second * 15
 )
 
 // Bitmask holds the bitmask client data
@@ -101,7 +98,6 @@ func initCore() (*zmq4.Socket, error) {
 		return nil, err
 	}
 
-	endpointPwd := "/var/tmp"
-	err = socket.Connect(fmt.Sprintf(coreEndpoint, endpointPwd))
+	err = socket.Connect(coreEndpoint)
 	return socket, err
 }
diff --git a/bitmask/unix.go b/bitmask/unix.go
index 0c62862f5cd09e9343b3e2e7ab0f6a7d74f8d7aa..a9768571e9a6b8bde43a227656b46e03e442de26 100644
--- a/bitmask/unix.go
+++ b/bitmask/unix.go
@@ -18,4 +18,6 @@ package bitmask
 
 import "os"
 
+const coreEndpoint = "ipc:///var/tmp/bitmask.core.sock"
+
 var ConfigPath = os.Getenv("HOME") + "/.config/leap"
diff --git a/bitmask/windows.go b/bitmask/windows.go
index 8babd4bec74639ca5017e6eec25baace679cef3c..b3d41aa47991f802100c4e17a8b5813631ae9792 100644
--- a/bitmask/windows.go
+++ b/bitmask/windows.go
@@ -18,4 +18,6 @@ package bitmask
 
 import "os"
 
+const coreEndpoint = "tcp://127.0.0.1:5001"
+
 var ConfigPath = os.Getenv("APPDATA") + "\\leap"