diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 100fb71d9..e13e45177 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -15,9 +15,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - dockerfile: ./client/Dockerfile
+          - context: ./client
             image: ghcr.io/surfscz/SBS-Client
-          - dockerfile: ./server/Dockerfile
+          - context: ./server
             image: ghcr.io/surfscz/SBS-Server
     permissions:
       contents: read
@@ -43,8 +43,7 @@ jobs:
       - name: Build and push Docker images
         uses: docker/build-push-action@v5
         with:
-          context: .
-          file: ${{ matrix.dockerfile }}
+          context: ${{ matrix.context }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}