diff --git a/.make/default.mk b/.make/default.mk
index 8aa7536a7..38daff1ed 100644
--- a/.make/default.mk
+++ b/.make/default.mk
@@ -5,7 +5,7 @@ node-generate-dev-default: node-generate-prod
 node-generate-prod-default: noop
 
 .PHONY: go-generate-default
-go-generate-default: go-generate
+go-generate-default: noop
 
 .PHONY: generate
 generate: generate-prod # production is always the default
diff --git a/opencloud/Makefile b/opencloud/Makefile
index f8828ab37..06dee692b 100644
--- a/opencloud/Makefile
+++ b/opencloud/Makefile
@@ -35,3 +35,9 @@ dev-docker-multiarch:
 debug-docker:
 	$(MAKE) --no-print-directory debug-linux-docker-$(GOARCH)
 	docker build -f docker/Dockerfile.linux.debug.$(GOARCH) -t opencloud-eu/opencloud:debug .
+
+.PHONY: node-generate-prod
+node-generate-prod: # opencloud needs assets of all other modules
+	@if [ $(MAKE_DEPTH) -le 1 ]; then \
+	$(MAKE) --no-print-directory -C .. node-generate-prod \
+	; fi;