diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml
index 0ff149d98..cf1063d94 100644
--- a/.github/workflows/build-and-push-image.yml
+++ b/.github/workflows/build-and-push-image.yml
@@ -16,7 +16,7 @@ on:
 env:
   IMG_ORG: kubeflow
   IMG_REPO: model-registry
-  IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
+  IMG: ${IMG_ORG}/${IMG_REPO}
   DOCKER_USER: ${{ secrets.DOCKERHUB_USERNAME }}
   DOCKER_PWD: ${{ secrets.DOCKERHUB_TOKEN }}
   PUSH_IMAGE: true
diff --git a/.github/workflows/build-image-pr.yml b/.github/workflows/build-image-pr.yml
index edf7f20ed..52d78d902 100644
--- a/.github/workflows/build-image-pr.yml
+++ b/.github/workflows/build-image-pr.yml
@@ -13,7 +13,7 @@ on:
 env:
   IMG_ORG: kubeflow
   IMG_REPO: model-registry
-  IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
+  IMG: ${IMG_ORG}/${IMG_REPO}
   PUSH_IMAGE: false
   BRANCH: ${{ github.base_ref }}
 jobs:
@@ -37,6 +37,7 @@ jobs:
         uses: karancode/kustomize-github-action@v1.3.2
         with:
           kustomize_version: '5.2.1'
+          kustomize_build_dir: 'manifests/kustomize/overlays/db'
       - name: Start Kind Cluster
         uses: helm/kind-action@v1.9.0
       - name: Load Local Registry Test Image