diff --git a/.github/workflows/iso.yml b/.github/workflows/iso.yml
index c1fc10c..64681be 100644
--- a/.github/workflows/iso.yml
+++ b/.github/workflows/iso.yml
@@ -35,11 +35,13 @@ on:
         default: main
 
 env:
-  IMAGE_VERSION: ${{ github.event.inputs.IMAGE_VERSION || '39' }}
-  IMAGE_ARCH: ${{ github.event.inputs.IMAGE_ARCH || 'x86_64' }}
-  IMAGE_NAME: ${{ github.event.inputs.IMAGE_NAME || 'base-main' }}
-  IMAGE_REPO: ${{ github.event.inputs.IMAGE_REPO || 'ghcr.io/ublue-os' }}
-  VARIANT: ${{ github.event.inputs.VARIANT || 'Silverblue' }}
+  IMAGE_VERSION: ${{ inputs.IMAGE_VERSION || '39' }}
+  IMAGE_ARCH: ${{ inputs.IMAGE_ARCH || 'x86_64' }}
+  IMAGE_NAME: ${{ inputs.IMAGE_NAME || 'base-main' }}
+  IMAGE_REPO: ${{ inputs.IMAGE_REPO || 'ghcr.io/ublue-os' }}
+  VARIANT: ${{ inputs.VARIANT || 'Silverblue' }}
+  CURR_REPO: ${{ inputs.BUILD_REPO || github.repository }}
+  CURR_REF: ${{ inputs.BUILD_REF || github.ref }}
 
 jobs:
   build-and-push-iso:
@@ -50,10 +52,6 @@ jobs:
     permissions:
       contents: read
       packages: write
-    env:
-      CURR_REPO: ${{ github.event.inputs.BUILD_REPO || github.repository }}
-      CURR_REF: ${{ github.event.inputs.BUILD_REF || github.ref }}
-    
     steps:
       - name: Install make and git
         run: dnf install -y make git