diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index 995052996b9..0e9e45fb608 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -109,10 +109,10 @@ jobs:
           fi
 
           # Env for matrix.image_flavor
-          if [[ "${{ matrix.image_flavor }}" == "nvidia" && \
+          if [[ "${{ matrix.image_flavor }}" =~ "nvidia" && \
                 "${{ matrix.fedora_version }}" != "beta" ]]; then
                   echo "image_flavor=main" >> $GITHUB_ENV
-                  echo "nvidia_type=nvidia" >> $GITHUB_ENV
+                  echo "nvidia_flavor=${{ matrix.image_flavor }}" >> $GITHUB_ENV
           elif [[ "${{ matrix.image_flavor }}" == "main" && \
                   "${{ matrix.fedora_version }}" != "beta" ]]; then
                echo "image_flavor=${{ matrix.image_flavor }}" >> $GITHUB_ENV
@@ -341,7 +341,7 @@ jobs:
           BUILD_ARGS+=("--build-arg" "FEDORA_MAJOR_VERSION=${{ env.fedora_version }}")
           BUILD_ARGS+=("--build-arg" "TARGET_BASE=${{ env.TARGET_BASE }}")
           BUILD_ARGS+=("--build-arg" "AKMODS_FLAVOR=${{ env.AKMODS_FLAVOR }}")
-          BUILD_ARGS+=("--build-arg" "NVIDIA_TYPE=${{ env.nvidia_type }}")
+          BUILD_ARGS+=("--build-arg" "NVIDIA_FLAVOR=${{ env.nvidia_flavor}}")
           BUILD_ARGS+=("--build-arg" "KERNEL=${{ env.kernel_release }}")
           BUILD_ARGS+=("--build-arg" "UBLUE_IMAGE_TAG=${{ matrix.fedora_version }}")
           BUILD_ARGS+=("--build-arg" "SHA_HEAD_SHORT=${{ env.SHA_HEAD_SHORT }}")
diff --git a/Containerfile b/Containerfile
index 40b7bb1cd65..3979870f978 100644
--- a/Containerfile
+++ b/Containerfile
@@ -5,7 +5,7 @@ ARG SOURCE_IMAGE="${SOURCE_IMAGE:-${BASE_IMAGE_NAME}-${IMAGE_FLAVOR}}"
 ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
 ARG TARGET_BASE="${TARGET_BASE:-bluefin}"
-ARG NVIDIA_TYPE="${NVIDIA_TYPE:-}"
+ARG NVIDIA_FLAVOR="${NVIDIA_FLAVOR:-}"
 ARG KERNEL="${KERNEL:-6.9.7-200.fc40.x86_64}"
 ARG UBLUE_IMAGE_TAG="${UBLUE_IMAGE_TAG:-latest}"
 ARG SHA_HEAD_SHORT="${SHA_HEAD_SHORT}"
@@ -32,7 +32,7 @@ ARG IMAGE_FLAVOR="${IMAGE_FLAVOR}"
 ARG AKMODS_FLAVOR="${AKMODS_FLAVOR}"
 ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
-ARG NVIDIA_TYPE="${NVIDIA_TYPE:-}"
+ARG NVIDIA_FLAVOR="${NVIDIA_FLAVOR:-}"
 ARG KERNEL="${KERNEL:-6.9.7-200.fc40.x86_64}"
 ARG UBLUE_IMAGE_TAG="${UBLUE_IMAGE_TAG:-latest}"
 ARG SHA_HEAD_SHORT="${SHA_HEAD_SHORT}"
@@ -63,7 +63,7 @@ ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
 ARG IMAGE_FLAVOR="${IMAGE_FLAVOR}"
 ARG AKMODS_FLAVOR="${AKMODS_FLAVOR}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
-ARG NVIDIA_TYPE="${NVIDIA_TYPE:-}"
+ARG NVIDIA_FLAVOR="${NVIDIA_FLAVOR:-}"
 ARG KERNEL="${KERNEL:-6.9.7-200.fc40.x86_64}"
 ARG UBLUE_IMAGE_TAG="${UBLUE_IMAGE_TAG:-latest}"
 
diff --git a/build_files/image-info.sh b/build_files/image-info.sh
index ebae9fba764..3e7893f0c79 100755
--- a/build_files/image-info.sh
+++ b/build_files/image-info.sh
@@ -22,8 +22,8 @@ if [[ "${BASE_IMAGE_NAME}" == "kinoite" ]]; then
   HOME_URL="https://getaurora.dev/"
 fi
 
-if [[ "${NVIDIA_TYPE}" == "nvidia" ]]; then
-  image_flavor="nvidia"
+if [[ "${NVIDIA_FLAVOR}" =~ "nvidia" ]]; then
+  image_flavor="${NVIDIA_FLAVOR}"
 fi
 
 cat > $IMAGE_INFO <<EOF
diff --git a/build_files/install-akmods.sh b/build_files/install-akmods.sh
index cc00f773937..29e3dd2202c 100755
--- a/build_files/install-akmods.sh
+++ b/build_files/install-akmods.sh
@@ -3,7 +3,7 @@
 set -ouex pipefail
 
 # Nvidia for gts/stable - nvidia
-if [[ "${NVIDIA_TYPE}" == "nvidia" ]]; then
+if [[ "${NVIDIA_FLAVOR}" =~ "nvidia" ]]; then
     curl -Lo /tmp/nvidia-install.sh https://raw.githubusercontent.com/ublue-os/hwe/main/nvidia-install.sh && \
     chmod +x /tmp/nvidia-install.sh && \
     IMAGE_NAME="${BASE_IMAGE_NAME}" RPMFUSION_MIRROR="" /tmp/nvidia-install.sh
diff --git a/build_files/nvidia.sh b/build_files/nvidia.sh
index 9462f8e5128..bb32c68287e 100755
--- a/build_files/nvidia.sh
+++ b/build_files/nvidia.sh
@@ -3,7 +3,7 @@
 set -ouex pipefail
 
 # Nvidia Configurations
-if [[ "${IMAGE_FLAVOR}" =~ "nvidia" || "${NVIDIA_TYPE}" =~ "nvidia" ]]; then
+if [[ "${IMAGE_FLAVOR}" =~ "nvidia" || "${NVIDIA_FLAVOR}" =~ "nvidia" ]]; then
     # Restore x11 for Nvidia Images
     if [[ "${BASE_IMAGE_NAME}" =~ "kinoite" && "${FEDORA_MAJOR_VERSION}" -gt "39" ]]; then
         rpm-ostree install plasma-workspace-x11
diff --git a/scripts/build-image.sh b/scripts/build-image.sh
index 63c1234c55c..7b00389e38c 100755
--- a/scripts/build-image.sh
+++ b/scripts/build-image.sh
@@ -39,7 +39,6 @@ tag=$(just _tag "${image}" "${target}")
 akmods_flavor=main
 if [[ "${version}" == "gts" || \
     "${version}" == "stable" ]]; then
-    nvidia_type="main"
     akmods_flavor=coreos-stable
 fi
 
@@ -55,7 +54,6 @@ command+=( --build-arg="IMAGE_FLAVOR=main" )
 command+=( --build-arg="IMAGE_VENDOR=localhost" )
 command+=( --build-arg="FEDORA_MAJOR_VERSION=${fedora_version}" )
 command+=( --build-arg="AKMODS_FLAVOR=${akmods_flavor}" )
-command+=( --build-arg="NVIDIA_TYPE=${nvidia_type:-}" )
 command+=( --build-arg="KERNEL=${KERNEL_RELEASE:-}" )
 command+=( --build-arg="UBLUE_IMAGE_TAG=${version}" )
 command+=( --build-arg="SOURCE_IMAGE=${base_image}-main" )