diff --git a/.github/workflows/build_iso_rhel.yml b/.github/workflows/build_iso_rhel.yml
index 78221f0..b72789a 100644
--- a/.github/workflows/build_iso_rhel.yml
+++ b/.github/workflows/build_iso_rhel.yml
@@ -121,16 +121,17 @@ jobs:
         id: build
         with:
           arch: ${{ needs.load_vars.outputs.ARCH }}
+          enrollment_password: ${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }}
           image_name: ${{ needs.load_vars.outputs.IMAGE_NAME }}
           image_repo: ${{ needs.load_vars.outputs.IMAGE_REPO }}
           image_tag: ${{ needs.load_vars.outputs.IMAGE_TAG }}
-          version: ${{ matrix.version }}
-          variant: ${{ needs.load_vars.outputs.VARIANT }}
-          secure_boot_key_url: ${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }}
-          enrollment_password: ${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }}
           iso_name: build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso
-          secrets_dir: ${{ format('{0}/ubi', github.workspace) }}
           repos: '/etc/yum.repos.d/redhat.repo'
+          secrets_dir: ${{ format('{0}/ubi', github.workspace) }}
+          secure_boot_key_url: ${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }}
+          ubi: "true"
+          variant: ${{ needs.load_vars.outputs.VARIANT }}
+          version: ${{ matrix.version }}
 
       - name: Upload ISO as artifact
         id: upload
diff --git a/action.yml b/action.yml
index f41e0e4..c8e1aff 100644
--- a/action.yml
+++ b/action.yml
@@ -84,6 +84,9 @@ inputs:
   skopeo_cache_key:
     description: Overrides the skopeo cache key
     required: false
+  ubi:
+    description: Use the UBI version of the builder image
+    required: false
   variant:
     description: "Source container variant. Available options can be found by running `dnf provides system-release`. Variant will be the third item in the package name. Example: `fedora-release-kinoite-39-34.noarch` will be kinonite"
     required: true
@@ -203,7 +206,7 @@ runs:
           volumes="--volume ${{ inputs.secrets_dir }}:/run/secrets"
         fi
         # RHEL
-        if [[ ${{ inputs.version }} -lt 30 ]]
+        if [[ "${{ inputs.ubi }}" == "true" ]]
         then
           image=${image}-ubi
         fi