diff --git a/.github/workflows/azure-container-webapp.yml b/.github/workflows/azure-container-webapp.yml
index a71c4e5..9a93087 100644
--- a/.github/workflows/azure-container-webapp.yml
+++ b/.github/workflows/azure-container-webapp.yml
@@ -62,6 +62,7 @@ jobs:
       - name: Build and push container image to registry
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
+          context: ./ShowcaseProject
           push: true
           tags: ghcr.io/${{ env.REPO }}:${{ github.sha }}
           file: ./ShowcaseProject/ShowcaseFrontend/Dockerfile
diff --git a/.github/workflows/docker-build-frontend.yml b/.github/workflows/docker-build-frontend.yml
index 91f4eaa..699f075 100644
--- a/.github/workflows/docker-build-frontend.yml
+++ b/.github/workflows/docker-build-frontend.yml
@@ -11,4 +11,4 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build the Frontend Docker image
-        run: docker build ShowcaseProject --file ShowcaseProject/ShowcaseFrontend/Dockerfile --tag my-image-name:$(date +%s)
+        run:  docker build --file ShowcaseProject/ShowcaseFrontend/Dockerfile --tag my-image-name:$(date +%s) ShowcaseProject
diff --git a/ShowcaseProject/ShowcaseFrontend/Dockerfile b/ShowcaseProject/ShowcaseFrontend/Dockerfile
index 715f725..61544c8 100644
--- a/ShowcaseProject/ShowcaseFrontend/Dockerfile
+++ b/ShowcaseProject/ShowcaseFrontend/Dockerfile
@@ -6,11 +6,10 @@ WORKDIR /app/ShowcaseFrontend
 CMD ["dotnet", "watch", "run", "--no-launch-profile", "--urls", "http://+:80"]
 
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
-WORKDIR /src
-COPY ShowcaseFrontend/ShowcaseFrontend.csproj ShowcaseFrontend/
-RUN dotnet restore ./ShowcaseFrontend/ShowcaseFrontend.csproj
-COPY ShowcaseFrontend/. ShowcaseFrontend/
 WORKDIR /src/ShowcaseFrontend
+COPY ShowcaseFrontend/ShowcaseFrontend.csproj ./
+RUN dotnet restore
+COPY ShowcaseFrontend/. ./
 RUN dotnet publish -c Release -o /app/publish /p:UseAppHost=false
 
 FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final