diff --git a/backend/Dockerfile b/backend/Dockerfile
index 372c9f9..b281f6f 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -11,11 +11,14 @@ FROM mcr.microsoft.com/dotnet/sdk:9.0 AS backend-build
 WORKDIR /src
 COPY nuget.config ./
 COPY backend.csproj ./
+ENV DOTNET_NUGET_AUDIT=false
 RUN dotnet nuget list source
 RUN dotnet restore
 COPY . .
 # Copy the frontend build output from the previous stage
 COPY --from=frontend-build /app/dist ./ClientApp/dist
+# Skip the SPA build in MSBuild since it's already built in Stage 1
+ENV SkipSpaBuild=true
 RUN dotnet publish -c Release -o /app/publish
 
 # Stage 3: Runtime
diff --git a/backend/backend.csproj b/backend/backend.csproj
index 8e895a7..e110326 100644
--- a/backend/backend.csproj
+++ b/backend/backend.csproj
@@ -39,7 +39,7 @@
     <Exec WorkingDirectory="$(SpaRoot)" Command="npm ci" />
   </Target>
 
-  <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
+  <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish" Condition=" '$(SkipSpaBuild)' != 'true' ">
     <!-- Build the frontend -->
     <Exec WorkingDirectory="$(SpaRoot)" Command="npm ci" Condition=" !Exists('$(SpaRoot)node_modules') " />
     <Exec WorkingDirectory="$(SpaRoot)" Command="npm run build" />