diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index f19205bf..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-[submodule "vendor/github.com/armadillica/gossdp"]
-	path = vendor/github.com/armadillica/gossdp
-	url = git@github.com:armadillica/gossdp.git
-	branch = logrus-compat
diff --git a/Gopkg.lock b/Gopkg.lock
index 487d9f9f..c4bd4e0a 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -9,14 +9,6 @@
   revision = "0ddd408d5d60ea76e320503cc7dd091992dee608"
   version = "v0.4.0"
 
-[[projects]]
-  branch = "logrus-compat"
-  digest = "1:12f9eb93aa8ca3739933ee5935924c8fe44b146970b7efadd5c061182bc88dc4"
-  name = "github.com/armadillica/gossdp"
-  packages = ["."]
-  pruneopts = ""
-  revision = "0fce4178969b53dec04e8927c31c36e9a6d9738d"
-
 [[projects]]
   digest = "1:0deddd908b6b4b768cfc272c16ee61e7088a60f7fe2f06c547bd3d8e1f8b8e77"
   name = "github.com/davecgh/go-spew"
@@ -105,6 +97,14 @@
   revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
   version = "v1.2.2"
 
+[[projects]]
+  branch = "logrus-compat"
+  digest = "1:12f9eb93aa8ca3739933ee5935924c8fe44b146970b7efadd5c061182bc88dc4"
+  name = "gitlab.com/blender-institute/gossdp"
+  packages = ["."]
+  pruneopts = ""
+  revision = "0fce4178969b53dec04e8927c31c36e9a6d9738d"
+
 [[projects]]
   branch = "master"
   digest = "1:887074c37fcefc2f49b5ae9c6f9f36107341aec23185613d0e9f1ee81db7f94a"
@@ -185,12 +185,12 @@
   analyzer-version = 1
   input-imports = [
     "github.com/abbot/go-http-auth",
-    "github.com/armadillica/gossdp",
     "github.com/fsnotify/fsnotify",
     "github.com/gorilla/mux",
     "github.com/kardianos/osext",
     "github.com/sirupsen/logrus",
     "github.com/stretchr/testify/assert",
+    "gitlab.com/blender-institute/gossdp",
     "golang.org/x/crypto/bcrypt",
     "gopkg.in/check.v1",
     "gopkg.in/jarcoal/httpmock.v1",
diff --git a/Gopkg.toml b/Gopkg.toml
index 6400d76b..0ddfbcb4 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -26,7 +26,7 @@
 
 [[constraint]]
   branch = "logrus-compat"
-  name = "github.com/armadillica/gossdp"
+  name = "gitlab.com/blender-institute/gossdp"
 
 [[constraint]]
   name = "github.com/fsnotify/fsnotify"
diff --git a/docker/build-via-docker.sh b/docker/build-via-docker.sh
index c3c725be..c373611e 100755
--- a/docker/build-via-docker.sh
+++ b/docker/build-via-docker.sh
@@ -27,7 +27,7 @@ docker run -i --rm \
      golang:1.11 /bin/bash -e << EOT
 echo -n "Using "
 go version
-cd \${GOPATH}/src/github.com/armadillica/flamenco-manager
+cd \${GOPATH}/src/git.blender.org/flamenco-manager.git
 
 function build {
     export GOOS=\$1
diff --git a/main.go b/main.go
index d98bff78..6bfd11bf 100644
--- a/main.go
+++ b/main.go
@@ -22,8 +22,8 @@ import (
 	"github.com/armadillica/flamenco-manager/flamenco"
 	"github.com/armadillica/flamenco-manager/flamenco/bundledmongo"
 	"github.com/armadillica/flamenco-manager/websetup"
-	"github.com/armadillica/gossdp"
 	"github.com/gorilla/mux"
+	"gitlab.com/blender-institute/gossdp"
 )
 
 const flamencoVersion = "2.3-dev1"