diff --git a/util/MsSqlMigratorUtility/Dockerfile b/util/MsSqlMigratorUtility/Dockerfile
index ae47705ead..990c25a7fb 100644
--- a/util/MsSqlMigratorUtility/Dockerfile
+++ b/util/MsSqlMigratorUtility/Dockerfile
@@ -9,37 +9,22 @@ ARG TARGETPLATFORM
 # Determine proper runtime value for .NET
 # We put the value in a file to be read by later layers.
 RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
-  RID=linux-x64 ; \
-  elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
-  RID=linux-arm64 ; \
-  elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \
-  RID=linux-arm ; \
-  fi \
-  && echo "RID=$RID" > /tmp/rid.txt
+    RID=linux-x64 ; \
+    elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
+    RID=linux-arm64 ; \
+    elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \
+    RID=linux-arm ; \
+    fi \
+    && echo "RID=$RID" > /tmp/rid.txt
 
-# Copy csproj files as distinct layers
+# Copy required project files
 WORKDIR /source
-COPY util/MsSqlMigratorUtility/*.csproj ./util/MsSqlMigratorUtility/
-COPY src/Core/*.csproj ./src/Core/
-COPY util/Migrator/*.csproj ./util/Migrator/
-COPY util/Server/*.csproj ./util/Server/
-COPY util/Server/Properties/*.csproj ./util/Server/Properties/
-COPY util/Server/Properties/launchSettings.json ./util/Server/Properties/
-COPY Directory.Build.props .
+COPY . ./
 
 # Restore project dependencies and tools
 WORKDIR /source/util/MsSqlMigratorUtility
 RUN . /tmp/rid.txt && dotnet restore -r $RID
 
-# Copy required project files
-WORKDIR /source
-COPY util/MsSqlMigratorUtility/. ./util/MsSqlMigratorUtility/
-COPY src/Core/. ./src/Core/
-COPY util/Migrator/. ./util/Migrator/
-COPY util/Server/. ./util/Server/
-COPY .git/. ./.git/
-COPY .editorconfig /source
-
 # Build project
 WORKDIR /source/util/MsSqlMigratorUtility
 RUN . /tmp/rid.txt && dotnet publish \
@@ -50,8 +35,6 @@ RUN . /tmp/rid.txt && dotnet publish \
     -r $RID \
     -o out
 
-WORKDIR /app
-
 ###############################################
 #                  App stage                  #
 ###############################################