diff --git a/.github/workflows/client.yaml b/.github/workflows/client.yaml
index 2cf17e6..8c8f903 100644
--- a/.github/workflows/client.yaml
+++ b/.github/workflows/client.yaml
@@ -75,9 +75,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
     name: Build
-    defaults:
-      run:
-        working-directory: client
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
@@ -92,7 +89,7 @@ jobs:
         shell: bash
 
       - name: Build
-        run: npm run build:prod
+        run: npm run build:prod --workspace=client
 
   docker-build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/gateway.yaml b/.github/workflows/gateway.yaml
index d876101..592dd83 100644
--- a/.github/workflows/gateway.yaml
+++ b/.github/workflows/gateway.yaml
@@ -84,7 +84,7 @@ jobs:
       - name: Build & Push Docker Test Build
         uses: docker/build-push-action@v4
         with:
-          context: .
+          context: ./gateway/
           push: ${{ github.event_name != 'pull_request' }}
           tags: hicsail/signlab-gateway:unstable
 
@@ -92,7 +92,7 @@ jobs:
         uses: docker/build-push-action@v4
         if: startsWith(github.ref, 'refs/tags/v')
         with:
-          context: .
+          context: ./gateway/
           push: ${{ github.event_name != 'pull_request' }}
           tags: hicsail/signlab-gateway:latest,hicsail/signlab-gateway:${{github.ref_name}}
 
diff --git a/.github/workflows/server.yaml b/.github/workflows/server.yaml
index f01cdfd..23e368c 100644
--- a/.github/workflows/server.yaml
+++ b/.github/workflows/server.yaml
@@ -69,9 +69,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
     name: Build
-    defaults:
-      run:
-        working-directory: server
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
@@ -86,7 +83,7 @@ jobs:
         shell: bash
 
       - name: Build
-        run: npm run build:prod
+        run: npm run build:prod --workspace=server
 
   docker-build:
     runs-on: ubuntu-latest