diff --git a/action.yml b/action.yml
index 493dec4..e3cdb69 100644
--- a/action.yml
+++ b/action.yml
@@ -136,14 +136,13 @@ runs:
         ACTION_REF: ${{ github.action_ref }}
       shell: bash
       run: |
-        image="ghcr.io/jasonn3/build-container-installer"
-        # Check if running inside of the action repo
-        if [[ -z "${ACTION_REPO}" || "${ACTION_REPO}" == "${{ github.repository }}" ]]
+        image=$(echo "ghcr.io/${{ github.repository }}" | tr [:upper:] [:lower:])
+        # Check if running inside01 of the action repo
+        if [[ -z "${ACTION_REPO}" ]]
         then
-          if [[ "${{ github.ref_name }}" =~ (.*)/merge ]]
+          if [[ -n "${{ github.event.issue.number }}" ]]
           then
-            tag="pr-${BASH_REMATCH[1]}"
-            image="docker.io/jasonn3/build-container-installer"
+            tag="pr-${{ github.event.issue.number }}"
           else
             tag="${{ github.ref_name }}"
           fi