diff --git a/.gitignore b/.gitignore
index dd6d63bc6a39c0a540c00b39ec7351ba792db550..860519a823d50ea9afa8556d83b1cbc9a9238c14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,21 @@
-config.yml
-cover.out
-tmp/*
-.idea
 *.log
 *.swp
-/*.log*
-authorized_keys.lock
-.gitlab_shell_secret
 .bundle
-tags
 .bundle/
-custom_hooks
-hooks/*.d
-/go_build
-/bin/gitlab-sshd
+.gitlab_shell_secret
+.idea
+/*.log*
+/bin/check
 /bin/gitlab-shell
 /bin/gitlab-shell-authorized-keys-check
 /bin/gitlab-shell-authorized-principals-check
-/bin/check
+/bin/gitlab-sshd
+/go_build
+authorized_keys.lock
+config.yml
+cover.out
+custom_hooks
+hooks/*.d
+tags
+tmp/*
+vendor
diff --git a/Makefile b/Makefile
index ae83d7c0297c3db38b1dfb8b76bffd34c4b1b730..55181714703e732bc98456d62f8be2ef4bb1f38b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ GO_SOURCES := $(shell find . -name '*.go')
 VERSION_STRING := $(shell git describe --match v* 2>/dev/null || awk '$$0="v"$$0' VERSION 2>/dev/null || echo unknown)
 BUILD_TIME := $(shell date -u +%Y%m%d.%H%M%S)
 BUILD_TAGS := tracer_static tracer_static_jaeger continuous_profiler_stackdriver
-GOBUILD_FLAGS := -ldflags "-X main.Version=$(VERSION_STRING) -X main.BuildTime=$(BUILD_TIME)" -tags "$(BUILD_TAGS)"
+GOBUILD_FLAGS := -ldflags "-X main.Version=$(VERSION_STRING) -X main.BuildTime=$(BUILD_TIME)" -tags "$(BUILD_TAGS)" -mod=mod
 
 PREFIX ?= /usr/local