diff --git a/Makefile b/Makefile
index 4db46d1..39074a9 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@
 TYPE                            ?= minimal
 
 # tool containers
-VOLTHA_TOOLS_VERSION ?= 2.1.0
+VOLTHA_TOOLS_VERSION ?= 2.2.0
 
 GO                = docker run --rm --user $$(id -u):$$(id -g) -v ${CURDIR}:/app $(shell test -t 0 && echo "-it") -v gocache:/.cache -v gocache-${VOLTHA_TOOLS_VERSION}:/go/pkg voltha/voltha-ci-tools:${VOLTHA_TOOLS_VERSION}-golang go
 GO_SH             = docker run --rm --user $$(id -u):$$(id -g) -v ${CURDIR}:/app $(shell test -t 0 && echo "-it") -v gocache:/.cache -v gocache-${VOLTHA_TOOLS_VERSION}:/go/pkg voltha/voltha-ci-tools:${VOLTHA_TOOLS_VERSION}-golang sh -c '
@@ -268,7 +268,7 @@
 	@${PROTOC} -I ./api \
 	  -I${GOOGLEAPI}/ \
 	  -I${VOLTHA_PROTOS}/protos/ \
-	  --swagger_out=logtostderr=true,allow_delete_body=true,grpc_api_configuration=$<:docs/swagger/ \
+	  --swagger_out=logtostderr=true,allow_delete_body=true,disable_default_errors=true,grpc_api_configuration=$<:docs/swagger/ \
 	  api/bbsim/bbsim.proto
 
 docs/swagger/leagacy/bbsim.swagger.json: api/legacy/bbsim.proto setup_tools
@@ -276,5 +276,5 @@
 	@${PROTOC} -I ./api \
 	  -I${GOOGLEAPI}/ \
 	  -I${VOLTHA_PROTOS}/protos/ \
-	  --swagger_out=logtostderr=true,allow_delete_body=true:docs/swagger/ \
+	  --swagger_out=logtostderr=true,allow_delete_body=true,disable_default_errors=true:docs/swagger/ \
 	  $<