diff --git a/roles/silverblue/tasks/main.yml b/roles/silverblue/tasks/main.yml
index b7d1a0a..9537b76 100644
--- a/roles/silverblue/tasks/main.yml
+++ b/roles/silverblue/tasks/main.yml
@@ -3,12 +3,29 @@
 
 - name: "Remove and install rpm-ostree software"
   block:
-    - name: "Remove preinstalled rpm-ostree packages"
-      community.general.rpm_ostree_pkg:
-        name: "{{ silverblue_rem_packages }}"
-        state: absent
+    - name: "Check if Gnome Software rpm-ostree is installed"
+      ansible.builtin.stat:
+        path: /usr/lib64/gnome-software/plugins-22/libgs_plugin_rpm-ostree.so
+      register: gnomesoftwarerpmostree_check
 
-    - name: "Upgrade the rpm-ostree image without options, accept all defaults"
+    - name: "Uninstall Gnome Software rpm-ostree if it is installed"
+      ansible.builtin.command: "rpm-ostree override remove gnome-software-rpm-ostree"
+      when: gnomesoftwarerpmostree_check.stat.exists
+      register: gnomesoftwarerpmostree_uninstall
+      changed_when: gnomesoftwarerpmostree_uninstall.rc != 0
+
+    - name: "Check if Gnome Software is installed"
+      ansible.builtin.stat:
+        path: /usr/sbin/gnome-software
+      register: gnomesoftware_check
+
+    - name: "Uninstall Gnome Software if it is installed"
+      ansible.builtin.command: "rpm-ostree override remove gnome-software"
+      when: gnomesoftware_check.stat.exists
+      register: gnomesoftware_uninstall
+      changed_when: gnomesoftware_uninstall.rc != 0
+
+    - name: "Upgrade the rpm-ostree image"
       ansible.posix.rpm_ostree_upgrade:
 
     - name: "Install packages"