diff --git a/Dockerfile b/Dockerfile
index 8363d9e10..d4c86cdad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,7 @@
 FROM owncloudci/golang:1.17 as build
 
 RUN apk update && \
-        apk add --update npm && \
-        apk add --update go
+        apk add --update npm
 
 COPY ./ /ocis/
 
diff --git a/ocis/Makefile b/ocis/Makefile
index 5a5b5635d..393a97796 100644
--- a/ocis/Makefile
+++ b/ocis/Makefile
@@ -33,7 +33,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
-	@make -C ../web generate
+	@make -C ../accounts ci-node-generate
+	@make -C ../graph-explorer ci-node-generate
+	@make -C ../settings ci-node-generate
+	@make -C ../web ci-node-generate
diff --git a/ocs/Makefile b/ocs/Makefile
index f1e17ccca..f64c8b62a 100644
--- a/ocs/Makefile
+++ b/ocs/Makefile
@@ -27,4 +27,4 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target
 
 .PHONY: ci-node-generate
 ci-node-generate: 
-	@make -C ../accounts generate
+	@make -C ../accounts ci-node-generate