diff --git a/.github/workflows/images/base/build_push.yml b/.github/workflows/images/base/build_push.yml
deleted file mode 100644
index b76f6d03..00000000
--- a/.github/workflows/images/base/build_push.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: Build base image
-
-on:
-  # Manually trigger
-  workflow_dispatch:
-    inputs:
-      reason:
-        description: 'Why ?'
-        required: false
-        default: ''
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: photon-ut-base
-
-jobs:
-  ghcr_build_and_push:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Set lower case owner name
-        run: |
-          echo "OWNER_LC=${OWNER,,}" >> ${GITHUB_ENV}
-        env:
-          OWNER: '${{ github.repository_owner }}'
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push image
-        uses: docker/build-push-action@v6
-        with:
-          # path context
-          context: .github/workflows/base
-          push: true
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
-            ${{ env.REGISTRY }}/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME}}:latest
-          platforms: linux/amd64
\ No newline at end of file
diff --git a/.github/workflows/images/fstack/build_push.yml b/.github/workflows/images/fstack/build_push.yml
deleted file mode 100644
index d6ce8615..00000000
--- a/.github/workflows/images/fstack/build_push.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: Build fstack image
-
-on:
-  # Manually trigger
-  workflow_dispatch:
-    inputs:
-      reason:
-        description: 'Why ?'
-        required: false
-        default: ''
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: photon-ut-fstack
-
-jobs:
-  ghcr_build_and_push:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Set lower case owner name
-        run: |
-          echo "OWNER_LC=${OWNER,,}" >> ${GITHUB_ENV}
-        env:
-          OWNER: '${{ github.repository_owner }}'
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push image
-        uses: docker/build-push-action@v6
-        with:
-          # path context
-          context: .github/workflows/fstack
-          push: true
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
-            ${{ env.REGISTRY }}/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME}}:latest
-          platforms: linux/amd64
\ No newline at end of file
diff --git a/.github/workflows/ut-image-base.yml b/.github/workflows/ut-image-base.yml
index b76f6d03..e845b079 100644
--- a/.github/workflows/ut-image-base.yml
+++ b/.github/workflows/ut-image-base.yml
@@ -44,7 +44,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           # path context
-          context: .github/workflows/base
+          context: .github/workflows/images/base
           push: true
           tags: |
             ${{ env.REGISTRY }}/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
diff --git a/.github/workflows/ut-image-fstack.yml b/.github/workflows/ut-image-fstack.yml
index d6ce8615..033aa097 100644
--- a/.github/workflows/ut-image-fstack.yml
+++ b/.github/workflows/ut-image-fstack.yml
@@ -44,7 +44,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           # path context
-          context: .github/workflows/fstack
+          context: .github/workflows/images/fstack
           push: true
           tags: |
             ${{ env.REGISTRY }}/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME }}:${{ github.sha }}