diff --git a/accounts/accounts.go b/accounts/accounts.go
index bab5b32d470..b9e06365949 100644
--- a/accounts/accounts.go
+++ b/accounts/accounts.go
@@ -4,5 +4,6 @@ import (
 	"embed"
 )
 
+//go:generate make generate
 //go:embed assets/*
 var Assets embed.FS
diff --git a/glauth/Makefile b/glauth/Makefile
index da706d7f1ed..b1aa2d7e19b 100644
--- a/glauth/Makefile
+++ b/glauth/Makefile
@@ -25,7 +25,6 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/graph-explorer/graph_explorer.go b/graph-explorer/graph_explorer.go
index afd01384297..6de3e4ccd71 100644
--- a/graph-explorer/graph_explorer.go
+++ b/graph-explorer/graph_explorer.go
@@ -4,5 +4,6 @@ import (
 	"embed"
 )
 
+//go:generate make generate
 //go:embed assets/*
 var Assets embed.FS
diff --git a/graph/Makefile b/graph/Makefile
index 23390312f8b..89e96a254e5 100644
--- a/graph/Makefile
+++ b/graph/Makefile
@@ -25,7 +25,6 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/idp/Makefile b/idp/Makefile
index d9d57a864be..1a6dbdc42f4 100644
--- a/idp/Makefile
+++ b/idp/Makefile
@@ -25,7 +25,6 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate: assets
diff --git a/idp/idp.go b/idp/idp.go
index 380e20d848f..26374c432fe 100644
--- a/idp/idp.go
+++ b/idp/idp.go
@@ -4,5 +4,6 @@ import (
 	"embed"
 )
 
+//go:generate make generate
 //go:embed assets/*
 var Assets embed.FS
diff --git a/ocis-pkg/Makefile b/ocis-pkg/Makefile
index 166ea425259..1f271f38cd4 100644
--- a/ocis-pkg/Makefile
+++ b/ocis-pkg/Makefile
@@ -27,7 +27,6 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/ocis/Makefile b/ocis/Makefile
index cf10747a668..4608380188b 100644
--- a/ocis/Makefile
+++ b/ocis/Makefile
@@ -34,7 +34,6 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate: # ocis needs assets of all other modules
diff --git a/ocs/Makefile b/ocs/Makefile
index 76c0c9398ff..9f13b146b3d 100644
--- a/ocs/Makefile
+++ b/ocs/Makefile
@@ -25,7 +25,6 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/proxy/Makefile b/proxy/Makefile
index 377ff3371ff..24c2898bdbb 100644
--- a/proxy/Makefile
+++ b/proxy/Makefile
@@ -25,7 +25,6 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/settings/settings.go b/settings/settings.go
index b31c92527c3..adcd98bb141 100644
--- a/settings/settings.go
+++ b/settings/settings.go
@@ -4,5 +4,6 @@ import (
 	"embed"
 )
 
+//go:generate make generate
 //go:embed assets/*
 var Assets embed.FS
diff --git a/storage/Makefile b/storage/Makefile
index c4827d0541f..1c6328966a7 100644
--- a/storage/Makefile
+++ b/storage/Makefile
@@ -25,7 +25,6 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/store/Makefile b/store/Makefile
index 1f6bf0e54ec..c227d2f8126 100644
--- a/store/Makefile
+++ b/store/Makefile
@@ -26,7 +26,6 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
-	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/thumbnails/Makefile b/thumbnails/Makefile
index c07fabe3e0d..41dd62ceda6 100644
--- a/thumbnails/Makefile
+++ b/thumbnails/Makefile
@@ -26,7 +26,6 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
-	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/web/assets/js/keep b/web/assets/js/keep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/web/web.go b/web/web.go
index 743bf572126..97753be529d 100644
--- a/web/web.go
+++ b/web/web.go
@@ -4,6 +4,6 @@ import (
 	"embed"
 )
 
+//go:generate make generate
 //go:embed assets/*
-//go:embed assets/js/*
 var Assets embed.FS
diff --git a/webdav/Makefile b/webdav/Makefile
index 503b5286c44..71fa2f5fd50 100644
--- a/webdav/Makefile
+++ b/webdav/Makefile
@@ -25,7 +25,6 @@ include ../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
-	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate: