diff --git a/Dockerfile b/Dockerfile
index 5b3531133f..524660daf6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,16 @@
-FROM owncloudci/golang:1.17 as build
+FROM owncloudci/nodejs:14 as generate
 
 COPY ./ /ocis/
 
 WORKDIR /ocis/ocis
-RUN make clean generate build
+RUN make ci-node-generate
+
+FROM owncloudci/golang:1.17 as build
+
+COPY --from=generate /ocis /ocis
+
+WORKDIR /ocis/ocis
+RUN make ci-go-generate build
 
 
 FROM alpine:3.13
@@ -15,9 +22,9 @@ RUN apk update && \
 	echo 'hosts: files dns' >| /etc/nsswitch.conf
 
 LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
-  org.label-schema.name="ownCloud Infinite Scale" \
-  org.label-schema.vendor="ownCloud GmbH" \
-  org.label-schema.schema-version="1.0"
+	org.label-schema.name="ownCloud Infinite Scale" \
+	org.label-schema.vendor="ownCloud GmbH" \
+	org.label-schema.schema-version="1.0"
 
 ENTRYPOINT ["/usr/bin/ocis"]
 CMD ["server"]