diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
index 1b0c39d5..47e22841 100644
--- a/.github/workflows/build-images.yaml
+++ b/.github/workflows/build-images.yaml
@@ -39,7 +39,10 @@ jobs:
         id: vars
         run: |
           echo "COMMIT_SHORT_SHA=${GITHUB_SHA:0:8}" >> $GITHUB_ENV
-          echo "LOWERCASE_REPO_OWNER=$(echo "${GITHUB_REPOSITORY_OWNER}" | awk '{print tolower($0)}')" >> $GITHUB_ENV
+          LOWERCASE_REPO_FULL_NAME=$(echo "${{ github.event.pull_request.head.repo.full_name }}" | awk '{print tolower($0)}')
+          echo ${LOWERCASE_REPO_FULL_NAME}
+          echo $(dirname ${LOWERCASE_REPO_FULL_NAME})
+          echo "LOWERCASE_REPO=$(dirname ${LOWERCASE_REPO_FULL_NAME})" >> $GITHUB_ENV
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -53,7 +56,7 @@ jobs:
 
       - name: Build image
         env:
-          IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/k8s-dra-driver
+          IMAGE_NAME: ghcr.io/${LOWERCASE_REPO}/k8s-dra-driver
           VERSION: ${COMMIT_SHORT_SHA}
           BUILD_MULTI_ARCH_IMAGES: "true"
           PUSH_ON_BUILD: "true"