diff --git a/config.yaml b/config.yaml
index 537948f..1a67b97 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,55 +1,21 @@
 actions:
+  - delete_line:
+      - target: "spec"
+        lines:
+          - |
+            # https://issues.redhat.com/browse/RHEL-26118
+            Patch1: subscription-manager.patch
+          - |
+            %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Subscription.desktop
+            %{_libexecdir}/gsd-subman
+            %{_libexecdir}/gsd-subman-helper
+            %{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.subman.policy
+            %{_datadir}/polkit-1/rules.d/org.gnome.settings-daemon.plugins.subman.rules
+
   - replace:
       - target: "spec"
-        find: "%autosetup -S git"
-        replace: |
-              %setup -q
-              
-              %patch00001 -p 1
-              %patch00002 -p 1
-              %patch00003 -p 1
-              %patch00004 -p 1
-              %patch10001 -p 1
-              %patch20001 -p 1
-              %patch30001 -p 1
-              %patch40001 -p 1
-              %patch50017 -p 1
-              %patch60001 -p 1
-              
-              %if %{with subman}
-              %patch50001 -p 1
-              %patch50002 -p 1
-              %patch50003 -p 1
-              %patch50004 -p 1
-              %patch50005 -p 1
-              %patch50006 -p 1
-              %patch50007 -p 1
-              %patch50008 -p 1
-              %patch50009 -p 1
-              %patch50010 -p 1
-              %patch50011 -p 1
-              %patch50012 -p 1
-              %patch50013 -p 1
-              %patch50014 -p 1
-              %patch50015 -p 1
-              %patch50016 -p 1
-              %endif
-        count: 1
-      - target: "spec"
-        find: |
-          %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Subscription.desktop
-          %{_libexecdir}/gsd-subman
-          %{_libexecdir}/gsd-subman-helper
-          %{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.subman.policy
-          %{_datadir}/polkit-1/rules.d/org.gnome.settings-daemon.plugins.subman.rules
-        replace: |
-          %if %{with subman}
-          %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Subscription.desktop
-          %{_libexecdir}/gsd-subman
-          %{_libexecdir}/gsd-subman-helper
-          %{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.subman.policy
-          %{_datadir}/polkit-1/rules.d/org.gnome.settings-daemon.plugins.subman.rules
-          %endif
+        find: "%global systemd_units org.gnome.SettingsDaemon.A11ySettings.service org.gnome.SettingsDaemon.Color.service org.gnome.SettingsDaemon.Datetime.service org.gnome.SettingsDaemon.Housekeeping.service org.gnome.SettingsDaemon.Keyboard.service org.gnome.SettingsDaemon.MediaKeys.service org.gnome.SettingsDaemon.Power.service org.gnome.SettingsDaemon.PrintNotifications.service org.gnome.SettingsDaemon.Rfkill.service org.gnome.SettingsDaemon.ScreensaverProxy.service org.gnome.SettingsDaemon.Sharing.service org.gnome.SettingsDaemon.Smartcard.service org.gnome.SettingsDaemon.Sound.service org.gnome.SettingsDaemon.UsbProtection.service org.gnome.SettingsDaemon.Wwan.service org.gnome.SettingsDaemon.XSettings.service %%{wacom_unit} org.gnome.SettingsDaemon.Subscription.service"
+        replace: "%global systemd_units org.gnome.SettingsDaemon.A11ySettings.service org.gnome.SettingsDaemon.Color.service org.gnome.SettingsDaemon.Datetime.service org.gnome.SettingsDaemon.Housekeeping.service org.gnome.SettingsDaemon.Keyboard.service org.gnome.SettingsDaemon.MediaKeys.service org.gnome.SettingsDaemon.Power.service org.gnome.SettingsDaemon.PrintNotifications.service org.gnome.SettingsDaemon.Rfkill.service org.gnome.SettingsDaemon.ScreensaverProxy.service org.gnome.SettingsDaemon.Sharing.service org.gnome.SettingsDaemon.Smartcard.service org.gnome.SettingsDaemon.Sound.service org.gnome.SettingsDaemon.UsbProtection.service org.gnome.SettingsDaemon.Wwan.service org.gnome.SettingsDaemon.XSettings.service %%{wacom_unit}"
         count: 1
 
   - modify_release: