diff --git a/Makefile b/Makefile
index c79c276..dbda623 100644
--- a/Makefile
+++ b/Makefile
@@ -78,8 +78,12 @@
 	sudo docker build -t $(IMAGENAME)-profile -f docker/Dockerfile.voltha-go-controller .
 
 sca: ## Runs static code analysis with the golangci-lint tool
+	@rm -rf ./sca-report
+	@mkdir -p ./sca-report
 	@echo "Running static code analysis..."
-	sudo docker run --rm --user $$(id -u):$$(id -g) -v $(CURDIR):/go/src ciena/go-lint
+	@${GOLANGCI_LINT} run -vv --deadline=6m --out-format junit-xml ./... | tee ./sca-report/sca-report.xml
+	@echo ""
+	@echo "Static code analysis OK"
 
 clean: ## Removes any local filesystem artifacts generated by a build
 	rm -f voltha-go-controller/voltha-go-controller