diff --git a/Makefile b/Makefile
index df9e56683..e04f1c45c 100644
--- a/Makefile
+++ b/Makefile
@@ -35,12 +35,7 @@ cli:
 			-o ./interface/spctl ./interface/cli/spider/spider.go
 
 swag swagger:
-		@echo -e '\t[CB-Spider] build Swagger docs'
-		@~/go/bin/swag i -g api-runtime/rest-runtime/CBSpiderRuntime.go -d ./,./cloud-control-manager -o api
-		@sed -i 's/github_com_cloud-barista_cb-spider_cloud-control-manager_cloud-driver_interfaces_resources./spider./g' ./api/docs.go
-		@sed -i 's/github_com_cloud-barista_cb-spider_cloud-control-manager_cloud-driver_interfaces_resources./spider./g' ./api/swagger.json
-		@sed -i 's/github_com_cloud-barista_cb-spider_cloud-control-manager_cloud-driver_interfaces_resources./spider./g' ./api/swagger.yaml
-		@sed -i 's/restruntime./spider./g' ./api/docs.go
-		@sed -i 's/restruntime./spider./g' ./api/swagger.json
-		@sed -i 's/restruntime./spider./g' ./api/swagger.yaml
-
+	@echo -e '\t[CB-Spider] generating Swagger documentation'
+	@~/go/bin/swag i -g api-runtime/rest-runtime/CBSpiderRuntime.go -d ./,./cloud-control-manager -o api > /dev/null 2>&1
+	@sed -i -e 's/github_com_cloud-barista_cb-spider_cloud-control-manager_cloud-driver_interfaces_resources./spider./g' \
+	        -e 's/restruntime./spider./g' ./api/docs.go ./api/swagger.json ./api/swagger.yaml
\ No newline at end of file