diff --git a/config.yaml b/config.yaml
index 541d8bd..1f45cb6 100644
--- a/config.yaml
+++ b/config.yaml
@@ -18,6 +18,9 @@ actions:
               Obsoletes: subscription-manager-plugin-container
               %endif
         replace: |
+              %if !%{use_container_plugin}
+              Obsoletes: subscription-manager-plugin-container
+              %endif
               # AlmaLinux do not provide the following packages no more
               Obsoletes: subscription-manager-cockpit
               Obsoletes: subscription-manager-initial-setup-addon
@@ -25,21 +28,20 @@ actions:
               Obsoletes: rhsm-icons
         count: 1
       - target: "spec"
-        find: "to manage subscriptions and yum repositories from the Red Hat entitlement"
-        replace: "to manage subscriptions and yum repositories from the EL entitlement"
-        count: 1
+        find: "a Red Hat"
+        replace: "a"
       - target: "spec"
-        find: "Summary: A GUI interface to manage Red Hat product subscriptions"
-        replace: "Summary: A GUI interface to manage product subscriptions"
-        count: 1
+        find: "the Red Hat"
+        replace: "the"
       - target: "spec"
-        find: "registering a system with a Red Hat Entitlement platform and manage"
-        replace: "registering a system with a Entitlement platform and manage"
-        count: 1
+        find: "Red Hat product subscriptions"
+        replace: "product subscriptions"
       - target: "spec"
-        find: "from the Red Hat entitlement platform; contains subscription-manager and"
-        replace: "from the entitlement platform; contains subscription-manager and"
-        count: 1
+        find: "Red Hat Subscription"
+        replace: "Subscription"
+      - target: "spec"
+        find: "Red Hat subscriptions"
+        replace: "subscriptions"
       - target: "spec"
         find: |
               %if (0%{?rhel} >= 8)
@@ -52,29 +54,6 @@ actions:
               %endif
               %endif
         count: 1
-      - target: "spec"
-        find: "Summary: A Python library to communicate with a Red Hat Unified Entitlement Platform"
-        replace: "Summary: A Python library to communicate with a Unified Entitlement Platform"
-        count: 2
-      - target: "spec"
-        find: "A small library for communicating with the REST interface of a Red Hat Unified"
-        replace: "A small library for communicating with the REST interface of a Unified"
-        count: 2
-      - target: "spec"
-        find: "Summary: Certificates required to communicate with a Red Hat Unified Entitlement Platform"
-        replace: "Summary: Certificates required to communicate with a Unified Entitlement Platform"
-        count: 1
-      - target: "spec"
-        find: "of a Red Hat Unified Entitlement Platform, used for the management of system entitlements"
-        replace: "of a Unified Entitlement Platform, used for the management of system entitlements"
-        count: 1
-      - target: "spec"
-        find: "Summary: Icons for Red Hat Subscription Management client tools"
-        replace: "Summary: Icons for Subscription Management client tools"
-      - target: "spec"
-        find: "of Red Hat subscriptions. There are many such interfaces, subscription-manager-gui,"
-        replace: "of subscriptions. There are many such interfaces, subscription-manager-gui,"
-        count: 1
       - target: "spec"
         find: |
               %if %{use_yum} || %{use_dnf}
diff --git a/files/subscription-manager-debrand.patch b/files/subscription-manager-debrand.patch
index 34b8933..ac83ccc 100644
--- a/files/subscription-manager-debrand.patch
+++ b/files/subscription-manager-debrand.patch
@@ -1,14 +1,3 @@
-diff -aruN subscription-manager-1.28.29/etc-conf/rhsm-icon.desktop.in subscription-manager-1.28.29.alma/etc-conf/rhsm-icon.desktop.in
---- subscription-manager-1.28.29/etc-conf/rhsm-icon.desktop.in	2022-04-13 18:01:03.000000000 +0300
-+++ subscription-manager-1.28.29.alma/etc-conf/rhsm-icon.desktop.in	2022-05-10 19:54:31.000000000 +0300
-@@ -1,6 +1,6 @@
- 
- [Desktop Entry]
--_Name=Red Hat Subscription Validity Applet
-+_Name=Subscription Validity Applet
- Icon=subscription-manager
- Exec=rhsm-icon
- Terminal=false
 diff -aruN subscription-manager-1.28.29/etc-conf/subscription-manager-cockpit.desktop.in subscription-manager-1.28.29.alma/etc-conf/subscription-manager-cockpit.desktop.in
 --- subscription-manager-1.28.29/etc-conf/subscription-manager-cockpit.desktop.in	2022-04-13 18:01:03.000000000 +0300
 +++ subscription-manager-1.28.29.alma/etc-conf/subscription-manager-cockpit.desktop.in	2022-05-10 19:54:57.000000000 +0300
@@ -29,19 +18,6 @@ diff -aruN subscription-manager-1.28.29/etc-conf/subscription-manager-gui.deskto
  Icon=subscription-manager
  Exec=subscription-manager-gui
  Terminal=false
-diff -aruN subscription-manager-1.28.29/src/subscription_manager/migrate/migrate.py subscription-manager-1.28.29.alma/src/subscription_manager/migrate/migrate.py
---- subscription-manager-1.28.29/src/subscription_manager/migrate/migrate.py	2022-04-13 18:01:03.000000000 +0300
-+++ subscription-manager-1.28.29.alma/src/subscription_manager/migrate/migrate.py	2022-05-10 19:59:46.000000000 +0300
-@@ -278,8 +278,7 @@
-             if self.options.five_to_six:
-                 msgs = [_("This system appears to already be registered to Satellite 6.")]
-             else:
--                msgs = [_("This system appears to already be registered to Red Hat Subscription Management.")]
--                msgs.append(_("Please visit https://access.redhat.com/management/consumers/%s to view the profile details.") % identity.uuid)
-+                msgs = [_("This system appears to already be registered to Subscription Management.")]
-             system_exit(1, msgs)
- 
-         try:
 diff -aruN subscription-manager-1.28.29/src/subscription_manager/repolib.py subscription-manager-1.28.29.alma/src/subscription_manager/repolib.py
 --- subscription-manager-1.28.29/src/subscription_manager/repolib.py	2022-04-13 18:01:03.000000000 +0300
 +++ subscription-manager-1.28.29.alma/src/subscription_manager/repolib.py	2022-05-10 20:01:44.000000000 +0300