diff --git a/Makefile b/Makefile
index 20a1b5c..7d5cefb 100644
--- a/Makefile
+++ b/Makefile
@@ -62,6 +62,8 @@
 build: docker-build
 
 docker-build: local-protos local-lib-go
+	go mod vendor
+	go build -mod=vendor
 	docker build $(DOCKER_BUILD_ARGS) -t ${IMAGENAME} -f docker/Dockerfile .
 
 docker-push:
@@ -138,6 +140,9 @@
 test: go_junit_install gocover_cobertura_install
 	@mkdir -p ./tests/results
 
+	go mod vendor
+	go build -mod=vendor
+
 	@go test -mod=vendor -v -coverprofile ./tests/results/go-test-coverage.out -covermode count ./... 2>&1 | tee ./tests/results/go-test-results.out ;\
 	RETURN=$$? ;\
 	$(GO_JUNIT_REPORT) < ./tests/results/go-test-results.out > ./tests/results/go-test-results.xml ;\