diff --git a/src/runtime/Makefile b/src/runtime/Makefile
index aaaca5aeb3..7628dc43dd 100644
--- a/src/runtime/Makefile
+++ b/src/runtime/Makefile
@@ -96,10 +96,10 @@ GENERATED_VARS = \
 		VERSION \
 		CONFIG_ACRN_IN \
 		CONFIG_QEMU_IN \
+		CONFIG_QEMU_NVIDIA_GPU_IN \
 		CONFIG_QEMU_SEV_IN \
 		CONFIG_QEMU_TDX_IN \
 		CONFIG_QEMU_SNP_IN \
-		CONFIG_QEMU_GPU_IN \
 		CONFIG_CLH_IN \
 		CONFIG_FC_IN \
 		$(USER_VARS)
@@ -322,11 +322,11 @@ ifneq (,$(QEMUCMD))
 
     CONFIGS += $(CONFIG_QEMU_SNP)
 
-    CONFIG_FILE_QEMU_GPU = configuration-qemu-gpu.toml
-    CONFIG_QEMU_GPU = config/$(CONFIG_FILE_QEMU_GPU)
-    CONFIG_QEMU_GPU_IN = $(CONFIG_QEMU_GPU).in
+    CONFIG_FILE_QEMU_NVIDIA_GPU = configuration-qemu-nvidia-gpu.toml
+    CONFIG_QEMU_NVIDIA_GPU = config/$(CONFIG_FILE_QEMU_NVIDIA_GPU)
+    CONFIG_QEMU_NVIDIA_GPU_IN = $(CONFIG_QEMU_NVIDIA_GPU).in
 
-    CONFIGS += $(CONFIG_QEMU_GPU)
+    CONFIGS += $(CONFIG_QEMU_NVIDIA_GPU)
 
     # qemu-specific options (all should be suffixed by "_QEMU")
     DEFBLOCKSTORAGEDRIVER_QEMU := virtio-scsi
diff --git a/src/runtime/config/configuration-qemu-gpu.toml.in b/src/runtime/config/configuration-qemu-nvidia-gpu.toml.in
similarity index 100%
rename from src/runtime/config/configuration-qemu-gpu.toml.in
rename to src/runtime/config/configuration-qemu-nvidia-gpu.toml.in
diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile
index 59ce2d06b0..091e3dc217 100644
--- a/tools/packaging/kata-deploy/local-build/Makefile
+++ b/tools/packaging/kata-deploy/local-build/Makefile
@@ -24,7 +24,7 @@ all-parallel: $(MK_DIR)/dockerbuild/install_yq.sh
 all: serial-targets \
 	firecracker-tarball \
 	kernel-dragonball-experimental-tarball \
-	kernel-nvidia-gpu \
+	kernel-nvidia-gpu-tarball \
 	kernel-nvidia-gpu-snp-tarball \
 	kernel-nvidia-gpu-tdx-experimental-tarball \
 	kernel-tarball \
diff --git a/tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml b/tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml
index 4e8da4fea9..b55096226a 100644
--- a/tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml
+++ b/tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml
@@ -93,8 +93,8 @@ scheduling:
 kind: RuntimeClass
 apiVersion: node.k8s.io/v1
 metadata:
-    name: kata-qemu-gpu
-handler: kata-qemu-gpu
+    name: kata-qemu-nvidia-gpu
+handler: kata-qemu-nvidia-gpu
 overhead:
     podFixed:
         memory: "160Mi"
diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
index 7e9841ad8b..68fd59b30d 100755
--- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh
+++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
@@ -16,8 +16,8 @@ containerd_conf_file_backup="${containerd_conf_file}.bak"
 shims=(
 	"fc"
 	"qemu"
+	"qemu-nvidia-gpu"
 	"qemu-tdx"
-	"qemu-gpu"
 	"qemu-snp"
 	"clh"
 	"dragonball"