diff --git a/Dockerfile.Service.arm b/Dockerfile.Service.arm
index 0a30b80e2..07d4f6293 100644
--- a/Dockerfile.Service.arm
+++ b/Dockerfile.Service.arm
@@ -1,14 +1,14 @@
-FROM microsoft/dotnet:2.1-sdk AS build-env
+FROM microsoft/dotnet:2.1-sdk AS build
 ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
-COPY . ./
+COPY ArchiSteamFarm ArchiSteamFarm
 RUN dotnet --info && \
     dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=generic /p:LinkDuringPublish=false && \
     cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh" "ArchiSteamFarm/out/ArchiSteamFarm-Service.sh"
 
-FROM microsoft/dotnet:2.1-runtime-stretch-slim-arm32v7
+FROM microsoft/dotnet:2.1-runtime-stretch-slim-arm32v7 AS runtime
 LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
 EXPOSE 1242
 WORKDIR /app
-COPY --from=build-env /app/ArchiSteamFarm/out ./
+COPY --from=build /app/ArchiSteamFarm/out .
 ENTRYPOINT ["./ArchiSteamFarm-Service.sh", "--no-restart", "--process-required", "--system-required"]
diff --git a/Dockerfile.Service.x64 b/Dockerfile.Service.x64
index 5d6c02a89..103771e8b 100644
--- a/Dockerfile.Service.x64
+++ b/Dockerfile.Service.x64
@@ -1,14 +1,14 @@
-FROM microsoft/dotnet:2.1-sdk AS build-env
+FROM microsoft/dotnet:2.1-sdk AS build
 ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
-COPY . ./
+COPY ArchiSteamFarm ArchiSteamFarm
 RUN dotnet --info && \
     dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=generic /p:LinkDuringPublish=false && \
     cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh" "ArchiSteamFarm/out/ArchiSteamFarm-Service.sh"
 
-FROM microsoft/dotnet:2.1-runtime-stretch-slim
+FROM microsoft/dotnet:2.1-runtime-stretch-slim AS runtime
 LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
 EXPOSE 1242
 WORKDIR /app
-COPY --from=build-env /app/ArchiSteamFarm/out ./
+COPY --from=build /app/ArchiSteamFarm/out .
 ENTRYPOINT ["./ArchiSteamFarm-Service.sh", "--no-restart", "--process-required", "--system-required"]
diff --git a/Dockerfile.arm b/Dockerfile.arm
index b3589cb62..627956816 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -1,14 +1,14 @@
-FROM microsoft/dotnet:2.1-sdk AS build-env
+FROM microsoft/dotnet:2.1-sdk AS build
 ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
-COPY . ./
+COPY ArchiSteamFarm ArchiSteamFarm
 RUN dotnet --info && \
     dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=docker /p:LinkDuringPublish=false && \
     cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/ArchiSteamFarm.sh"
 
-FROM microsoft/dotnet:2.1-runtime-stretch-slim-arm32v7
+FROM microsoft/dotnet:2.1-runtime-stretch-slim-arm32v7 AS runtime
 LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
 EXPOSE 1242
 WORKDIR /app
-COPY --from=build-env /app/ArchiSteamFarm/out ./
+COPY --from=build /app/ArchiSteamFarm/out .
 ENTRYPOINT ["./ArchiSteamFarm.sh", "--no-restart", "--process-required", "--system-required"]
diff --git a/Dockerfile.x64 b/Dockerfile.x64
index 5e3b2dc1c..71aecf867 100644
--- a/Dockerfile.x64
+++ b/Dockerfile.x64
@@ -1,14 +1,14 @@
-FROM microsoft/dotnet:2.1-sdk AS build-env
+FROM microsoft/dotnet:2.1-sdk AS build
 ENV NET_CORE_VERSION netcoreapp2.1
 WORKDIR /app
-COPY . ./
+COPY ArchiSteamFarm ArchiSteamFarm
 RUN dotnet --info && \
     dotnet publish ArchiSteamFarm -c Release -f "$NET_CORE_VERSION" -o out /nologo /p:ASFVariant=docker /p:LinkDuringPublish=false && \
     cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/ArchiSteamFarm.sh"
 
-FROM microsoft/dotnet:2.1-runtime-stretch-slim
+FROM microsoft/dotnet:2.1-runtime-stretch-slim AS runtime
 LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
 EXPOSE 1242
 WORKDIR /app
-COPY --from=build-env /app/ArchiSteamFarm/out ./
+COPY --from=build /app/ArchiSteamFarm/out .
 ENTRYPOINT ["./ArchiSteamFarm.sh", "--no-restart", "--process-required", "--system-required"]