diff --git a/Dockerfile b/Dockerfile
index 5b3531133f..d4c86cdadc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,8 @@
 FROM owncloudci/golang:1.17 as build
 
+RUN apk update && \
+        apk add --update npm
+
 COPY ./ /ocis/
 
 WORKDIR /ocis/ocis
diff --git a/accounts/Makefile b/accounts/Makefile
index 3557e8f134..28265c2934 100644
--- a/accounts/Makefile
+++ b/accounts/Makefile
@@ -31,8 +31,8 @@ docs-generate: config-docs-generate \
 include ../.make/generate.mk
 
 .PHONY: ci-go-generate
-ci-go-generate: #protobuf # CI runs ci-node-generate automatically before this target
-	# @go generate ./...
+ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate: yarn-build
diff --git a/graph-explorer/Makefile b/graph-explorer/Makefile
index 9c6cf2e178..e5ab1994f6 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 ./...
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/ocis/Makefile b/ocis/Makefile
index b610e49fc4..5a5b5635d6 100644
--- a/ocis/Makefile
+++ b/ocis/Makefile
@@ -32,6 +32,7 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target
 
 .PHONY: ci-node-generate
 ci-node-generate:
+	@npm install --global yarn
 	@make -C ../accounts generate
 	@make -C ../graph-explorer generate
 	@make -C ../settings generate
diff --git a/settings/Makefile b/settings/Makefile
index 16e9f8184d..3889e4cb1a 100644
--- a/settings/Makefile
+++ b/settings/Makefile
@@ -32,8 +32,8 @@ docs-generate: config-docs-generate \
 include ../.make/generate.mk
 
 .PHONY: ci-go-generate
-ci-go-generate: #protobuf # CI runs ci-node-generate automatically before this target
-	#@go generate ./...
+ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate: yarn-build
diff --git a/web/Makefile b/web/Makefile
index 6f258a2e13..f9ea026e88 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 ./...
+	@go generate ./...
 
 .PHONY: ci-node-generate
 ci-node-generate: