diff --git a/ironic/drivers/modules/pxe_grub_config.template b/ironic/drivers/modules/pxe_grub_config.template
index 1845f176d71..e73cd4607a7 100644
--- a/ironic/drivers/modules/pxe_grub_config.template
+++ b/ironic/drivers/modules/pxe_grub_config.template
@@ -13,8 +13,8 @@ menuentry "boot_partition"  {
 }
 
 menuentry "boot_ramdisk"  {
-    linuxefi {{ pxe_options.deployment_aki_path }} root=/dev/ram0 text {{ pxe_options.pxe_append_params|default("", true) }} {{ pxe_options.ramdisk_opts|default('', true) }}
-    initrdefi {{ pxe_options.deployment_ari_path }}
+    linuxefi {{ pxe_options.aki_path }} root=/dev/ram0 text {{ pxe_options.pxe_append_params|default("", true) }} {{ pxe_options.ramdisk_opts|default('', true) }}
+    initrdefi {{ pxe_options.ari_path }}
 }
 
 menuentry "boot_whole_disk"  {
diff --git a/ironic/tests/unit/drivers/pxe_grub_config.template b/ironic/tests/unit/drivers/pxe_grub_config.template
index 15e3635a099..d1574bbbd56 100644
--- a/ironic/tests/unit/drivers/pxe_grub_config.template
+++ b/ironic/tests/unit/drivers/pxe_grub_config.template
@@ -13,8 +13,8 @@ menuentry "boot_partition"  {
 }
 
 menuentry "boot_ramdisk"  {
-    linuxefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/deploy_kernel root=/dev/ram0 text test_param ramdisk_param
-    initrdefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/deploy_ramdisk
+    linuxefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/kernel root=/dev/ram0 text test_param ramdisk_param
+    initrdefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/ramdisk
 }
 
 menuentry "boot_whole_disk"  {
diff --git a/releasenotes/notes/ramdisk-grub-use-user-kernel-ramdisk-7d572fe130932605.yaml b/releasenotes/notes/ramdisk-grub-use-user-kernel-ramdisk-7d572fe130932605.yaml
new file mode 100644
index 00000000000..06a4bba3f7f
--- /dev/null
+++ b/releasenotes/notes/ramdisk-grub-use-user-kernel-ramdisk-7d572fe130932605.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - Fixes a bug with the grub ramdisk boot template handling, such that the template now properly
+    references the user provided kernal and ramdisk. Previously the deployment ramdisk and kernel
+    was referenced in the template.