diff --git a/app/views/unattended/provisioning_templates/PXEGrub2/preseed_default_pxegrub2.erb b/app/views/unattended/provisioning_templates/PXEGrub2/preseed_default_pxegrub2.erb
index 09897020374..ee563114ace 100644
--- a/app/views/unattended/provisioning_templates/PXEGrub2/preseed_default_pxegrub2.erb
+++ b/app/views/unattended/provisioning_templates/PXEGrub2/preseed_default_pxegrub2.erb
@@ -19,7 +19,7 @@ description: |
   os_major = @host.operatingsystem.major.to_i
   os_name  = @host.operatingsystem.name
 
-  if (os_name == 'Ubuntu' && os_major > 12) || (os_name == 'Debian' && os_major > 8)
+  if (os_name == 'Ubuntu' && os_major > 12 && os_major < 24) || (os_name == 'Debian' && os_major > 8 && os_major < 13)
     efi_suffix = 'efi'
   else
     efi_suffix = ''
diff --git a/app/views/unattended/provisioning_templates/PXEGrub2/preseed_default_pxegrub2_autoinstall.erb b/app/views/unattended/provisioning_templates/PXEGrub2/preseed_default_pxegrub2_autoinstall.erb
index 28c0e89e20f..f65ca788ae1 100644
--- a/app/views/unattended/provisioning_templates/PXEGrub2/preseed_default_pxegrub2_autoinstall.erb
+++ b/app/views/unattended/provisioning_templates/PXEGrub2/preseed_default_pxegrub2_autoinstall.erb
@@ -19,7 +19,13 @@ test_on:
 #   System locale
 #
 <%
-  efi_suffix = 'efi'
+  os_major = @host.operatingsystem.major.to_i
+
+  if (os_major > 12 && os_major < 24)
+    efi_suffix = 'efi'
+  else
+    efi_suffix = ''
+  end
 -%>
 
 set default=0