diff --git a/Makefile b/Makefile
index 3e600e1..edf2a94 100644
--- a/Makefile
+++ b/Makefile
@@ -4,22 +4,23 @@ announce:
 	$(call becho,"=== Ello Streams Project ===")
 
 get-tools:
-	@go get -u "github.com/Masterminds/glide"
-	@go build "github.com/Masterminds/glide"
-	@go get -u "github.com/alecthomas/gometalinter"
+	go install "github.com/Masterminds/glide"
+	# @go get -u "github.com/Masterminds/glide"
+	# @go build "github.com/Masterminds/glide"
+	# @go get -u "github.com/alecthomas/gometalinter"
 	# This is broken for the moment due to https://github.com/opennota/check/issues/25
 	# When that's fixed we can go back to the `gometalinter` command instead of individual installs
 	# @gometalinter --install --update --force
-	@go get -u -f "golang.org/x/tools/cmd/goimports"
-	@go get -u -f "github.com/kisielk/errcheck"
-	@go get -u -f "github.com/gordonklaus/ineffassign"
-	@go get -u -f "github.com/mibk/dupl"
-	@go get -u -f "github.com/alecthomas/gometalinter"
-	@go get -u -f "golang.org/x/tools/cmd/gotype"
-	@go get -u -f "github.com/tsenart/deadcode"
-	@go get -u -f "github.com/alecthomas/gocyclo"
-	@go get -u -f "github.com/mvdan/interfacer/cmd/interfacer"
-	@go get -u -f "github.com/golang/lint/golint"
+	go install "golang.org/x/tools/cmd/goimports"
+	go install "github.com/kisielk/errcheck"
+	go install "github.com/gordonklaus/ineffassign"
+	go install "github.com/mibk/dupl"
+	go install "github.com/alecthomas/gometalinter"
+	go install "golang.org/x/tools/cmd/gotype"
+	go install "github.com/tsenart/deadcode"
+	go install "github.com/alecthomas/gocyclo"
+	go install "github.com/mvdan/interfacer/cmd/interfacer"
+	go install "github.com/golang/lint/golint"
 	@$(PRINT_OK)
 
 install:export GO15VENDOREXPERIMENT=1
diff --git a/api/controller.go b/api/controller.go
index 874b9e0..985aac2 100644
--- a/api/controller.go
+++ b/api/controller.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/julienschmidt/httprouter"
 	"github.com/unrolled/render"
 )
diff --git a/api/controllers_suite_test.go b/api/controllers_suite_test.go
index 4d75eef..f3fb47b 100644
--- a/api/controllers_suite_test.go
+++ b/api/controllers_suite_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/ello/streams/api"
 	"github.com/ello/streams/model"
 	"github.com/julienschmidt/httprouter"
diff --git a/api/health_controller.go b/api/health_controller.go
index e6ad572..6cb7d19 100644
--- a/api/health_controller.go
+++ b/api/health_controller.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/julienschmidt/httprouter"
 	metrics "github.com/rcrowley/go-metrics"
 )
diff --git a/api/stream_controller.go b/api/stream_controller.go
index 5a1f85c..61a3e1c 100644
--- a/api/stream_controller.go
+++ b/api/stream_controller.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/ello/streams/model"
 	"github.com/ello/streams/service"
 	"github.com/ello/streams/util"
diff --git a/glide b/glide
new file mode 100755
index 0000000..1c4c627
Binary files /dev/null and b/glide differ
diff --git a/glide.lock b/glide.lock
new file mode 100644
index 0000000..fa2d4f0
--- /dev/null
+++ b/glide.lock
@@ -0,0 +1,111 @@
+hash: 156dae25ecc489ba3c6fafad06640c796966fb7d60a5194dd8f0d0db79cb268c
+updated: 2022-01-10T13:42:28.791938+01:00
+imports:
+- name: github.com/codegangsta/negroni
+  version: 3c3f8059b4bbc720ce576ca2d369069601914e8b
+- name: github.com/fsnotify/fsnotify
+  version: 3eb7fa4b3213c056d4657a9776041e96e8fe73b6
+- name: github.com/golang/protobuf
+  version: 5d5e8c018a13017f9d5b8bf4fad64aaa42a87308
+  subpackages:
+  - proto
+- name: github.com/julienschmidt/httprouter
+  version: fe77dd05ab5a80f54110cccf1b7d8681c2648323
+- name: github.com/m4rw3r/uuid
+  version: 80a86a3c3b1ac9e67012257d8274482639cf8ea5
+- name: github.com/meatballhat/negroni-logrus
+  version: bc51654b084894b7caba1d1ec352408c4271b5d2
+- name: github.com/mihasya/go-metrics-librato
+  version: c2a1624c7a80c6ad27067d6757b074c867e0b444
+- name: github.com/OneOfOne/xxhash
+  version: 8506fca4db5e15f5171d12924cd554f9303ad373
+  subpackages:
+  - native
+- name: github.com/onsi/ginkgo
+  version: d38b9d946d52cd175495d30143fbecc5aff98f13
+  subpackages:
+  - config
+  - formatter
+  - ginkgo
+  - internal/codelocation
+  - internal/containernode
+  - internal/failer
+  - internal/global
+  - internal/leafnodes
+  - internal/remote
+  - internal/spec
+  - internal/spec_iterator
+  - internal/specrunner
+  - internal/suite
+  - internal/testingtproxy
+  - internal/writer
+  - reporters
+  - reporters/stenographer
+  - reporters/stenographer/support/go-colorable
+  - reporters/stenographer/support/go-isatty
+  - types
+- name: github.com/onsi/gomega
+  version: 72e60405bee2d97bf8ea5889ed918fde7c39189e
+  subpackages:
+  - format
+  - internal
+  - matchers
+  - matchers/support/goraph/bipartitegraph
+  - matchers/support/goraph/edge
+  - matchers/support/goraph/node
+  - matchers/support/goraph/util
+  - types
+- name: github.com/rcrowley/go-metrics
+  version: cf1acfcdf4751e0554ffa765d03e479ec491cad6
+- name: github.com/sirupsen/logrus
+  version: 79c5ab66aa2ce7d9ff7b3c437ebc22fcc519a967
+- name: github.com/unrolled/render
+  version: da2cd662f9c6c8bedb43ce6620b7a772c639f673
+- name: github.com/urfave/negroni
+  version: 3c3f8059b4bbc720ce576ca2d369069601914e8b
+- name: golang.org/x/sys
+  version: 1d35b9e2eb4edf581781c7f3e2a36fac701f0a24
+  subpackages:
+  - internal/unsafeheader
+  - unix
+  - windows
+- name: gopkg.in/gemnasium/logrus-airbrake-hook.v2
+  version: e928b033a891c0175fb643d5aa0779e86325eb12
+testImports:
+- name: github.com/nxadm/tail
+  version: 4472660a31a6f0014e888512303dc49785913d8b
+  subpackages:
+  - ratelimiter
+  - util
+  - watch
+  - winfile
+- name: golang.org/x/net
+  version: 5cfca573fb4de1b4540d42c216f39c8d1cbbb494
+  subpackages:
+  - html
+  - html/atom
+  - html/charset
+- name: golang.org/x/text
+  version: 18b340fc7af22495828ffbe71e9f9e22583bc7a9
+  subpackages:
+  - encoding
+  - encoding/charmap
+  - encoding/htmlindex
+  - encoding/internal
+  - encoding/internal/identifier
+  - encoding/japanese
+  - encoding/korean
+  - encoding/simplifiedchinese
+  - encoding/traditionalchinese
+  - encoding/unicode
+  - internal/language
+  - internal/language/compact
+  - internal/tag
+  - internal/utf8internal
+  - language
+  - runes
+  - transform
+- name: gopkg.in/tomb.v1
+  version: dd632973f1e7218eb1089048e0798ec9ae7dceb8
+- name: gopkg.in/yaml.v2
+  version: 7649d4548cb53a614db133b2a8ac1f31859dda8c
diff --git a/glide.yaml b/glide.yaml
index a114ffe..643327b 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -1,12 +1,18 @@
 package: github.com/ello/streams
+
 import:
-- package: github.com/onsi/ginkgo
+- package: github.com/onsi/ginkgo/ginkgo
+  version: v1.16.5
+
 - package: github.com/onsi/gomega
 - package: github.com/julienschmidt/httprouter
 - package: github.com/golang/protobuf
   subpackages:
   - /proto
-- package: github.com/Sirupsen/logrus
+
+- package: github.com/sirupsen/logrus
+  version: master
+
 - package: gopkg.in/gemnasium/logrus-airbrake-hook.v2
 - package: github.com/m4rw3r/uuid
 - package: github.com/unrolled/render
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..2bc78ef
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,3 @@
+module ello.co/streams
+
+go 1.17
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..e69de29
diff --git a/main.go b/main.go
index 0c5c713..43c7cfa 100644
--- a/main.go
+++ b/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/codegangsta/negroni"
 	"github.com/ello/streams/api"
 	"github.com/ello/streams/service"
diff --git a/model/roshi_test.go b/model/roshi_test.go
index eabdefa..21ad051 100644
--- a/model/roshi_test.go
+++ b/model/roshi_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/ello/streams/model"
 	"github.com/m4rw3r/uuid"
 )
diff --git a/service/roshi.go b/service/roshi.go
index e5e4f8f..c0c0b96 100644
--- a/service/roshi.go
+++ b/service/roshi.go
@@ -13,7 +13,7 @@ import (
 	"net/url"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/ello/streams/model"
 )
diff --git a/service/service_suite_test.go b/service/service_suite_test.go
index f4efcca..8b9c979 100644
--- a/service/service_suite_test.go
+++ b/service/service_suite_test.go
@@ -3,7 +3,7 @@ package service_test
 import (
 	"testing"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )