diff --git a/.dockerignore b/.dockerignore
index 75c0856b..81f5dbe2 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,7 +1,7 @@
 .git
 **/build
 **/dist
-**/nodes_modules
+src/Kyoo.WebApp/Front/nodes_modules
 **/bin
 **/obj
 docs
diff --git a/Dockerfile b/Dockerfile
index 632203ac..0b03612d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,11 +4,12 @@ WORKDIR /transcoder
 COPY src/Kyoo.Transcoder .
 RUN cmake . && make -j
 
-FROM node:alpine as webapp
+FROM node:16-alpine as webapp
 WORKDIR /webapp
 COPY src/Kyoo.WebApp/Front .
-RUN npm install
-RUN npm run build -- --configuration production
+RUN npm install -g @angular/cli #???
+RUN yarn install --frozen-lockfile
+RUN yarn run build --configuration production
 
 FROM mcr.microsoft.com/dotnet/sdk:5.0 as builder
 COPY . .
diff --git a/src/Kyoo.WebApp/Front b/src/Kyoo.WebApp/Front
index f9741049..326c9aa9 160000
--- a/src/Kyoo.WebApp/Front
+++ b/src/Kyoo.WebApp/Front
@@ -1 +1 @@
-Subproject commit f9741049100f90d09be88826b02c079b00b8b91b
+Subproject commit 326c9aa9d35a265fbada2f6b268a2740a5beab8e