diff --git a/Makefile b/Makefile
index b9e66cf42..ac33a6750 100644
--- a/Makefile
+++ b/Makefile
@@ -134,10 +134,10 @@ format: ## Format code
 	buf format -w ./sdk/proto/
 
 generate-swagger: ## Generates swagger.json from source code
-	$(GORUN) github.com/go-swagger/go-swagger/cmd/swagger generate spec -o ./docs/swagger.json --scan-models
+	$(GORUN) $(GO_SWAGGER) generate spec -o ./docs/swagger.json --scan-models
 
 launch-swagger-ui: generate-swagger ## Launch Swagger UI
-	$(GORUN) github.com/go-swagger/go-swagger/cmd/swagger serve ./docs/swagger.json -F=swagger --port=8082 --no-open
+	$(GORUN) $(GO_SWAGGER) serve ./docs/swagger.json -F=swagger --port=8082 --no-open
 	
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # Local Packaging                                                                                                 #
diff --git a/Makefile.tools b/Makefile.tools
index 708182724..08acab53f 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -3,7 +3,7 @@
 BUF                = "github.com/bufbuild/buf/cmd/buf@v1.29.0"
 OAPI_CODEGEN       = "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@v2.0.0"
 LEFTHOOK           = "github.com/evilmartians/lefthook@v1.5.5"
-GO_SWAGGER         = "github.com/go-swagger/go-swagger/cmd/swagger@v0.30.5"
+GO_SWAGGER         = "github.com/go-swagger/go-swagger/cmd/swagger@abb53530bfcf49c470e5f4c7071ee43f37ec7437" # v0.30.5 currently broken. Update expected shortly. Ref: https://github.com/go-swagger/go-swagger/issues/3070
 PROTOBUF           = "github.com/gogo/protobuf/protoc-gen-gogo@v1.3.2"
 GOLANGCI_LINT      = "github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2"
 PROTOC_GENGO       = "google.golang.org/protobuf/cmd/protoc-gen-go@v1.32.0"