diff --git a/roles/fedora/tasks/main.yml b/roles/fedora/tasks/main.yml
index 149c0f9..3960963 100644
--- a/roles/fedora/tasks/main.yml
+++ b/roles/fedora/tasks/main.yml
@@ -49,6 +49,6 @@
 
 
 - name: "Install Flatpaks"
-  flatpak:
+  community.general.flatpak:
     name: "{{ fedora_flatpaks }}"
     state: present
diff --git a/roles/silverblue/tasks/main.yml b/roles/silverblue/tasks/main.yml
index d59d6b6..7749229 100644
--- a/roles/silverblue/tasks/main.yml
+++ b/roles/silverblue/tasks/main.yml
@@ -2,7 +2,6 @@
 # tasks file for fedoraSilverblue
 
 - name: "Remove and install rpm-ostree software"
-  become: true
   block:
     - name: "Upgrade the rpm-ostree image without options, accept all defaults"
       ansible.posix.rpm_ostree_upgrade:
@@ -20,8 +19,26 @@
         line: >-
           [ERR] Error while removing, updating or installing software.
 
+- name: "Remove, update and install Flathub software"
+  block:
+    - name: "Remove preinstalled Flatpaks"
+      community.general.flatpak:
+        name: "{{ silverblue_rem_flatpaks }}"
+        state: absent
 
-- name: "Install Flatpaks"
-  flatpak:
-    name: "{{ silverblue_flatpaks }}"
-    state: present
+    - name: "Update existing flatpaks"
+      community.general.flatpak:
+        name: "*"
+        state: latest
+
+    - name: "Install Flatpaks"
+      community.general.flatpak:
+        name: "{{ silverblue_flatpaks }}"
+        state: present
+
+  rescue:
+    - name: "Log errors"
+      ansible.builtin.lineinfile:
+        dest: "{{ log_path }}"
+        line: >-
+          [ERR] Error while removing, updating or installing flatpaks.
diff --git a/roles/silverblue/vars/main.yml b/roles/silverblue/vars/main.yml
index ab7222d..e2e7f91 100644
--- a/roles/silverblue/vars/main.yml
+++ b/roles/silverblue/vars/main.yml
@@ -7,6 +7,13 @@ silverblue_rem_packages:
 silverblue_packages:
   - python-psutil
 
+silverblue_rem_flatpaks:
+  - org.fedoraproject.MediaWriter
+  - org.gnome.Evince
+  - org.gnome.Extensions
+  - org.gnome.Weather
+  - org.gnome.baobab
+
 silverblue_flatpaks:
   - com.vscodium.codium
   - com.nextcloud.desktopclient.nextcloud