diff --git a/Makefile b/Makefile
index 61c791ea7b..7aa1a927b1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,10 @@ go_bin := $(shell go env GOPATH)/bin
 gen_authopt_path := $(go_bin)/protoc-gen-authoption
 gen_zitadel_path := $(go_bin)/protoc-gen-zitadel
 
+.PHONY: hodor
+hodor: 
+	echo $(gen_authopt_path)
+
 now := $(shell date '+%Y-%m-%dT%T%z' | sed -E 's/.([0-9]{2})([0-9]{2})$$/-\1:\2/')
 VERSION ?= development-$(now)
 COMMIT_SHA ?= $(shell git rev-parse HEAD)
@@ -82,7 +86,7 @@ core_grpc_dependencies:
 
 .PHONY: core_api
 core_api: core_api_generator core_grpc_dependencies
-	npx buf generate
+	PATH="$(go_bin):$(PATH)" npx buf generate
 	mkdir -p pkg/grpc
 	cp -r .artifacts/grpc/github.com/zitadel/zitadel/pkg/grpc/** pkg/grpc/
 	mkdir -p openapi/v2/zitadel
diff --git a/internal/api/ui/login/statik/generate.go b/internal/api/ui/login/statik/generate.go
index 5388980631..e74f5e4179 100644
--- a/internal/api/ui/login/statik/generate.go
+++ b/internal/api/ui/login/statik/generate.go
@@ -1,3 +1,3 @@
 package statik
 
-//go:generate statik -f -src=../static -dest=.. -ns=login
+//go:generate go run github.com/rakyll/statik -f -src=../static -dest=.. -ns=login
diff --git a/internal/notification/statik/generate.go b/internal/notification/statik/generate.go
index f840619a94..4604d0b60a 100644
--- a/internal/notification/statik/generate.go
+++ b/internal/notification/statik/generate.go
@@ -1,3 +1,3 @@
 package statik
 
-//go:generate statik -f -src=../static -dest=.. -ns=notification
+//go:generate go run github.com/rakyll/statik -f -src=../static -dest=.. -ns=notification
diff --git a/internal/statik/generate.go b/internal/statik/generate.go
index e407630ae6..d1ee0cb995 100644
--- a/internal/statik/generate.go
+++ b/internal/statik/generate.go
@@ -1,3 +1,3 @@
 package statik
 
-//go:generate statik -f -src=../static -dest=.. -ns=zitadel
+//go:generate go run github.com/rakyll/statik -f -src=../static -dest=.. -ns=zitadel