diff --git a/.github/workflows/branch.python.agent-framework-sampler-py.yml b/.github/workflows/branch.python.agent-framework-sampler-py.yml
index 3f2d7af..10bf2b2 100644
--- a/.github/workflows/branch.python.agent-framework-sampler-py.yml
+++ b/.github/workflows/branch.python.agent-framework-sampler-py.yml
@@ -13,6 +13,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  PROJECT_NAME: agent-framework-sampler-py
   WORKSPACE: python/agent-framework-sampler-py
 
 jobs:
@@ -41,7 +42,7 @@ jobs:
       - uses: percebus/github-actions-common/.github/actions/checkout@main
       - uses: percebus/github-actions-docker/.github/actions/build@main
         with:
-          repository_name: ${{ github.event.repository.name }}.${{ env.WORKSPACE }}
+          repository_name: ${{ github.event.repository.name }}.${{ env.PROJECT_NAME }}
           working-directory: ${{ env.WORKSPACE }}
           target: ${{ matrix.target }}
           scan-image: "false"
diff --git a/.github/workflows/branch.python.semantic-kernel-sampler-py.yml b/.github/workflows/branch.python.semantic-kernel-sampler-py.yml
index 5dbcc14..cfde385 100644
--- a/.github/workflows/branch.python.semantic-kernel-sampler-py.yml
+++ b/.github/workflows/branch.python.semantic-kernel-sampler-py.yml
@@ -13,6 +13,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  PROJECT_NAME: semantic-kernel-sampler-py
   WORKSPACE: python/semantic-kernel-sampler-py
 
 jobs:
@@ -41,7 +42,7 @@ jobs:
       - uses: percebus/github-actions-common/.github/actions/checkout@main
       - uses: percebus/github-actions-docker/.github/actions/build@main
         with:
-          repository_name: ${{ github.event.repository.name }}.${{ env.WORKSPACE }}
+          repository_name: ${{ github.event.repository.name }}.${{ env.PROJECT_NAME }}
           working-directory: ${{ env.WORKSPACE }}
           target: ${{ matrix.target }}
           scan-image: "false"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4021d0a..2e2faa3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -158,27 +158,32 @@ jobs:
           #   target: modelcontextprotocol.inspector
           #   scan-image: false
 
-          - working-directory: .
+          - project-name: node
+            working-directory: .
             target: tested
             scan-image: false
 
           #
           # semantic-kernel-sampler-py
-          - working-directory: python/semantic-kernel-sampler-py
+          - project-name: semantic-kernel-sampler-py
+            working-directory: python/semantic-kernel-sampler-py
             target: tested
             scan-image: false
 
-          - working-directory: python/semantic-kernel-sampler-py
+          - project-name: semantic-kernel-sampler-py
+            working-directory: python/semantic-kernel-sampler-py
             target: release
             scan-image: ${{ github.ref == 'refs/heads/main' }}
 
           #
           # agent-framework-sampler-py
-          - working-directory: python/agent-framework-sampler-py
+          - project-name: agent-framework-sampler-py
+            working-directory: python/agent-framework-sampler-py
             target: tested
             scan-image: false
 
-          - working-directory: python/agent-framework-sampler-py
+          - project-name: agent-framework-sampler-py
+            working-directory: python/agent-framework-sampler-py
             target: release
             scan-image: ${{ github.ref == 'refs/heads/main' }}
 
@@ -188,7 +193,7 @@ jobs:
       - uses: percebus/github-actions-common/.github/actions/checkout@main
       - uses: percebus/github-actions-docker/.github/actions/build@main
         with:
-          repository_name: ${{ github.event.repository.name }}:${{ matrix.working-directory }}
+          repository_name: ${{ github.event.repository.name }}:${{ matrix.project-name }}
           working-directory: ${{ matrix.working-directory }}
           target: ${{ matrix.target }}
           scan-image: ${{ matrix.scan-image }}