diff --git a/package/autoyast2.changes b/package/autoyast2.changes
index de25e406..46f7af03 100644
--- a/package/autoyast2.changes
+++ b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Feb 15 09:09:59 UTC 2024 - Ladislav Slezák <lslezak@suse.com>
+
+- Install standard SLES when the AY XML profile selects SLE_HPC,
+  it has been dropped in SP6 (jsc#PED-7841)
+- 4.6.5
+
 -------------------------------------------------------------------
 Fri Sep 22 10:25:35 UTC 2023 - Ancor Gonzalez Sosa <ancor@suse.com>
 
diff --git a/package/autoyast2.spec b/package/autoyast2.spec
index 360b4367..028c6c27 100644
--- a/package/autoyast2.spec
+++ b/package/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.6.4
+Version:        4.6.5
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only
diff --git a/src/modules/AutoinstFunctions.rb b/src/modules/AutoinstFunctions.rb
index 835b59a7..a8ec2030 100644
--- a/src/modules/AutoinstFunctions.rb
+++ b/src/modules/AutoinstFunctions.rb
@@ -8,6 +8,13 @@ module Yast
   class AutoinstFunctionsClass < Module
     include Yast::Logger
 
+    # special mapping for handling dropped or renamed products,
+    # a map with <old product name> => <new_product name> values
+    PRODUCT_MAPPING = {
+      # the SLE_HPC product was dropped and replaced by standard SLES in SP6
+      "SLE_HPC" => "SLES"
+    }.freeze
+
     def main
       textdomain "installation"
 
@@ -220,7 +227,7 @@ def identify_product_by_selection(profile)
     # FIXME: Currently it returns first found product name. It should be no
     # problem since this section was unused in AY installation so far.
     # However, it might be needed to add a special handling for multiple
-    # poducts in the future. At least we can filter out products which are
+    # products in the future. At least we can filter out products which are
     # not base products.
     #
     # @param profile [Hash] AutoYaST profile
@@ -234,7 +241,15 @@ def base_product_name(profile)
         return nil
       end
 
-      software.fetch_as_array("products").first
+      product = software.fetch_as_array("products").first
+      new_product = PRODUCT_MAPPING[product]
+
+      if new_product
+        log.info "Replacing requested product #{product.inspect} with #{new_product.inspect}"
+        return new_product
+      end
+
+      product
     end
   end