diff --git a/Dockerfile.Service.arm b/Dockerfile.Service.arm
index 895a3a468..9a1938b48 100644
--- a/Dockerfile.Service.arm
+++ b/Dockerfile.Service.arm
@@ -1,6 +1,15 @@
-FROM microsoft/dotnet:2.1-sdk AS build
+FROM node AS build-node
+WORKDIR /app
+COPY ASF-ui .
+RUN echo "Node.js: $(node --version)" && \
+    echo "npm: $(npm --version)" && \
+    npm ci --no-progress && \
+    npm run-script deploy --no-progress
+
+FROM microsoft/dotnet:2.1-sdk AS build-dotnet
 ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
+COPY --from=build-node /app/dist ASF-ui/dist
 COPY ArchiSteamFarm ArchiSteamFarm
 RUN dotnet --info && \
     dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=generic /p:LinkDuringPublish=false && \
@@ -11,5 +20,5 @@ ENV ASPNETCORE_URLS=
 LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
 EXPOSE 1242
 WORKDIR /app
-COPY --from=build /app/ArchiSteamFarm/out .
+COPY --from=build-dotnet /app/ArchiSteamFarm/out .
 ENTRYPOINT ["./ArchiSteamFarm-Service.sh", "--no-restart", "--process-required", "--system-required"]
diff --git a/Dockerfile.Service.x64 b/Dockerfile.Service.x64
index 599228f5d..09e426a0c 100644
--- a/Dockerfile.Service.x64
+++ b/Dockerfile.Service.x64
@@ -1,6 +1,15 @@
-FROM microsoft/dotnet:2.1-sdk AS build
+FROM node AS build-node
+WORKDIR /app
+COPY ASF-ui .
+RUN echo "Node.js: $(node --version)" && \
+    echo "npm: $(npm --version)" && \
+    npm ci --no-progress && \
+    npm run-script deploy --no-progress
+
+FROM microsoft/dotnet:2.1-sdk AS build-dotnet
 ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
+COPY --from=build-node /app/dist ASF-ui/dist
 COPY ArchiSteamFarm ArchiSteamFarm
 RUN dotnet --info && \
     dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=generic /p:LinkDuringPublish=false && \
@@ -11,5 +20,5 @@ ENV ASPNETCORE_URLS=
 LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
 EXPOSE 1242
 WORKDIR /app
-COPY --from=build /app/ArchiSteamFarm/out .
+COPY --from=build-dotnet /app/ArchiSteamFarm/out .
 ENTRYPOINT ["./ArchiSteamFarm-Service.sh", "--no-restart", "--process-required", "--system-required"]
diff --git a/Dockerfile.arm b/Dockerfile.arm
index 11804293f..66b2ac374 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -1,6 +1,15 @@
-FROM microsoft/dotnet:2.1-sdk AS build
+FROM node AS build-node
+WORKDIR /app
+COPY ASF-ui .
+RUN echo "Node.js: $(node --version)" && \
+    echo "npm: $(npm --version)" && \
+    npm ci --no-progress && \
+    npm run-script deploy --no-progress
+
+FROM microsoft/dotnet:2.1-sdk AS build-dotnet
 ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
+COPY --from=build-node /app/dist ASF-ui/dist
 COPY ArchiSteamFarm ArchiSteamFarm
 RUN dotnet --info && \
     dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=docker /p:LinkDuringPublish=false && \
@@ -11,5 +20,5 @@ ENV ASPNETCORE_URLS=
 LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
 EXPOSE 1242
 WORKDIR /app
-COPY --from=build /app/ArchiSteamFarm/out .
+COPY --from=build-dotnet /app/ArchiSteamFarm/out .
 ENTRYPOINT ["./ArchiSteamFarm.sh", "--no-restart", "--process-required", "--system-required"]
diff --git a/Dockerfile.x64 b/Dockerfile.x64
index 130338c33..5d11b6de1 100644
--- a/Dockerfile.x64
+++ b/Dockerfile.x64
@@ -1,6 +1,15 @@
-FROM microsoft/dotnet:2.1-sdk AS build
+FROM node AS build-node
+WORKDIR /app
+COPY ASF-ui .
+RUN echo "Node.js: $(node --version)" && \
+    echo "npm: $(npm --version)" && \
+    npm ci --no-progress && \
+    npm run-script deploy --no-progress
+
+FROM microsoft/dotnet:2.1-sdk AS build-dotnet
 ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
+COPY --from=build-node /app/dist ASF-ui/dist
 COPY ArchiSteamFarm ArchiSteamFarm
 RUN dotnet --info && \
     dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=docker /p:LinkDuringPublish=false && \
@@ -11,5 +20,5 @@ ENV ASPNETCORE_URLS=
 LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
 EXPOSE 1242
 WORKDIR /app
-COPY --from=build /app/ArchiSteamFarm/out .
+COPY --from=build-dotnet /app/ArchiSteamFarm/out .
 ENTRYPOINT ["./ArchiSteamFarm.sh", "--no-restart", "--process-required", "--system-required"]