diff --git a/accounts/Makefile b/accounts/Makefile
index 8946bd75f..c22dfa6f1 100644
--- a/accounts/Makefile
+++ b/accounts/Makefile
@@ -32,7 +32,7 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate: yarn-build
diff --git a/glauth/Makefile b/glauth/Makefile
index f5f731ad3..db06341bd 100644
--- a/glauth/Makefile
+++ b/glauth/Makefile
@@ -23,7 +23,7 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/graph-explorer/Makefile b/graph-explorer/Makefile
index ec7460f49..c63bcdece 100644
--- a/graph-explorer/Makefile
+++ b/graph-explorer/Makefile
@@ -23,7 +23,7 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/graph/Makefile b/graph/Makefile
index 3ce061c30..7b62e9198 100644
--- a/graph/Makefile
+++ b/graph/Makefile
@@ -23,7 +23,7 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...
 
 .PHONY: ci-node-generate
-ci-node-generate:
\ No newline at end of file
+ci-node-generate:
diff --git a/idp/Makefile b/idp/Makefile
index 25439c40e..03df0baa6 100644
--- a/idp/Makefile
+++ b/idp/Makefile
@@ -23,7 +23,7 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate: assets
diff --git a/ocis-pkg/Makefile b/ocis-pkg/Makefile
index db14059bb..2eba870af 100644
--- a/ocis-pkg/Makefile
+++ b/ocis-pkg/Makefile
@@ -27,7 +27,7 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/ocis/Makefile b/ocis/Makefile
index 219cf8228..9a361f8d5 100644
--- a/ocis/Makefile
+++ b/ocis/Makefile
@@ -28,7 +28,7 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/ocs/Makefile b/ocs/Makefile
index 6b8b74370..d1d11683e 100644
--- a/ocs/Makefile
+++ b/ocs/Makefile
@@ -23,7 +23,7 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/proxy/Makefile b/proxy/Makefile
index aaeb9677a..eb4a47e20 100644
--- a/proxy/Makefile
+++ b/proxy/Makefile
@@ -23,7 +23,7 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/settings/Makefile b/settings/Makefile
index ca12312fd..3d50e84a5 100644
--- a/settings/Makefile
+++ b/settings/Makefile
@@ -33,7 +33,7 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate: yarn-build
diff --git a/storage/Makefile b/storage/Makefile
index eb4222aa2..27a6a6ab3 100644
--- a/storage/Makefile
+++ b/storage/Makefile
@@ -23,7 +23,7 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/store/Makefile b/store/Makefile
index 124c9b84f..6805484e2 100644
--- a/store/Makefile
+++ b/store/Makefile
@@ -24,7 +24,7 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/thumbnails/Makefile b/thumbnails/Makefile
index 03d05669d..d4f4b8d9e 100644
--- a/thumbnails/Makefile
+++ b/thumbnails/Makefile
@@ -24,7 +24,7 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/web/Makefile b/web/Makefile
index d71f9a3d5..bcaef25c4 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -23,7 +23,7 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/webdav/Makefile b/webdav/Makefile
index 1b85dfaf1..beeb7a499 100644
--- a/webdav/Makefile
+++ b/webdav/Makefile
@@ -23,7 +23,7 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate: