diff --git a/.github/workflows/buildwindowsimage.yml b/.github/workflows/buildwindowsimage.yml
index a895748..922d2ce 100644
--- a/.github/workflows/buildwindowsimage.yml
+++ b/.github/workflows/buildwindowsimage.yml
@@ -24,11 +24,11 @@ jobs:
       run: |
         docker build . --file EstateReportingAPI/Dockerfilewindows --tag stuartferguson/estatereportingapiwindows:dev
         docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
-        docker push stuartferguson/estatereportingapi:dev
+        docker push stuartferguson/estatereportingapiwindows:dev
 
     - name: Publish Images to Docker Hub - Formal Release
       if: ${{ github.event.release.prerelease == false }} 
       run: |
         docker build . --file EstateReportingAPI/Dockerfilewindows --tag stuartferguson/estatereportingapiwindows:latest
         docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
-        docker push stuartferguson/estatereportingapi:latest
+        docker push stuartferguson/estatereportingapiwindows:latest
diff --git a/.github/workflows/createrelease.yml b/.github/workflows/createrelease.yml
index be8d817..f9d4407 100644
--- a/.github/workflows/createrelease.yml
+++ b/.github/workflows/createrelease.yml
@@ -23,12 +23,7 @@ jobs:
       run: dotnet restore EstateReportingAPI.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
 
     - name: Build Code
-      run: dotnet build EstateReportingAPI.sln --configuration Release
-
-    - name: Run Unit Tests
-      run: |
-        echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}"
-        dotnet test "EstateReportingAPI.Tests\EstateReportingAPI.Tests.csproj"      
+      run: dotnet build EstateReportingAPI.sln --configuration Release   
         
     - name: Publish Images to Docker Hub - Pre Release
       if: ${{ github.event.release.prerelease == true }} 
diff --git a/.github/workflows/nightlybuild.yml b/.github/workflows/nightlybuild.yml
index f83ab3f..c4cdfdd 100644
--- a/.github/workflows/nightlybuild.yml
+++ b/.github/workflows/nightlybuild.yml
@@ -38,10 +38,9 @@ jobs:
         dotnet test "EstateReportingAPI.IntegrationTests\EstateReportingAPI.IntegrationTests.csproj" /p:CollectCoverage=true /p:Exclude="[xunit*]*" /p:ExcludeByAttribute="Obsolete" /p:ExcludeByAttribute="GeneratedCodeAttribute" /p:ExcludeByAttribute="CompilerGeneratedAttribute" /p:ExcludeByAttribute="ExcludeFromCodeCoverageAttribute" /p:CoverletOutput="../lcov2.info" /maxcpucount:1 /p:CoverletOutputFormat="lcov"        
 
     - uses: actions/upload-artifact@v4
-      if: ${{ failure() }}
       with:
         name: tracelogs
-        path: /home/txnproc/trace/   
+        path: /home/runner/trace/   
 
     - uses: dacbd/create-issue-action@main
       if: ${{ failure() }}
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 863444f..b534753 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -32,7 +32,6 @@ jobs:
         dotnet test "EstateReportingAPI.IntegrationTests\EstateReportingAPI.IntegrationTests.csproj"
 
     - uses: actions/upload-artifact@v4
-      if: ${{ failure() }}
       with:
         name: tracelogs
-        path: /home/txnproc/trace/   
+        path: /home/runner/trace/   
diff --git a/EstateReportingAPI/Dockerfile b/EstateReportingAPI/Dockerfile
index c337686..2ead79c 100644
--- a/EstateReportingAPI/Dockerfile
+++ b/EstateReportingAPI/Dockerfile
@@ -20,6 +20,5 @@ RUN dotnet publish "EstateReportingAPI.csproj" -c Release -o /app/publish /p:Use
 
 FROM base AS final
 WORKDIR /app
-COPY --from=publish --chown=10001:10001 /app/publish .
-USER 10001:10001
-ENTRYPOINT ["dotnet", "EstateReportingAPI.dll"]
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "EstateReportingAPI.dll"]
\ No newline at end of file