diff --git a/amd64.Dockerfile b/amd64.Dockerfile
index 5d274244f..d999503d2 100644
--- a/amd64.Dockerfile
+++ b/amd64.Dockerfile
@@ -5,10 +5,10 @@ COPY BTCPayServer/BTCPayServer.csproj BTCPayServer/BTCPayServer.csproj
 COPY BTCPayServer.Common/BTCPayServer.Common.csproj BTCPayServer.Common/BTCPayServer.Common.csproj
 COPY BTCPayServer.Rating/BTCPayServer.Rating.csproj BTCPayServer.Rating/BTCPayServer.Rating.csproj
 RUN cd BTCPayServer && dotnet restore
-COPY Version.csproj Version.csproj
 COPY BTCPayServer/. BTCPayServer/.
 COPY BTCPayServer.Rating/. BTCPayServer.Rating/.
 COPY BTCPayServer.Common/. BTCPayServer.Common/.
+COPY Version.csproj Version.csproj
 RUN cd BTCPayServer && dotnet publish --output /app/ --configuration Release
 
 FROM mcr.microsoft.com/dotnet/core/aspnet:2.1.9-alpine3.7
diff --git a/arm32v7.Dockerfile b/arm32v7.Dockerfile
index 16cef2393..492b7d6f5 100644
--- a/arm32v7.Dockerfile
+++ b/arm32v7.Dockerfile
@@ -9,10 +9,10 @@ COPY BTCPayServer/BTCPayServer.csproj BTCPayServer/BTCPayServer.csproj
 COPY BTCPayServer.Common/BTCPayServer.Common.csproj BTCPayServer.Common/BTCPayServer.Common.csproj
 COPY BTCPayServer.Rating/BTCPayServer.Rating.csproj BTCPayServer.Rating/BTCPayServer.Rating.csproj
 RUN dotnet restore
-COPY Version.csproj Version.csproj
 COPY BTCPayServer/. BTCPayServer/.
 COPY BTCPayServer.Rating/. BTCPayServer.Rating/.
 COPY BTCPayServer.Common/. BTCPayServer.Common/.
+COPY Version.csproj Version.csproj
 RUN cd BTCPayServer && dotnet publish --output /app/ --configuration Release
 
 # Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program
diff --git a/btcpayserver.sln b/btcpayserver.sln
index b05251406..5005ec58f 100644
--- a/btcpayserver.sln
+++ b/btcpayserver.sln
@@ -9,10 +9,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BTCPayServer.Tests", "BTCPa
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{29290EC7-00E6-4C4B-96D9-4D7E9611DF28}"
 	ProjectSection(SolutionItems) = preProject
+		amd64.Dockerfile = amd64.Dockerfile
+		arm32v7.Dockerfile = arm32v7.Dockerfile
 		.circleci\config.yml = .circleci\config.yml
 		docker-entrypoint.sh = docker-entrypoint.sh
-		Dockerfile.linuxamd64 = Dockerfile.linuxamd64
-		Dockerfile.linuxarm32v7 = Dockerfile.linuxarm32v7
 		Version.csproj = Version.csproj
 	EndProjectSection
 EndProject