diff --git a/update.yml b/update.yml
index cab9b8c..b8c803c 100644
--- a/update.yml
+++ b/update.yml
@@ -54,20 +54,19 @@
       failed_when: false
       changed_when: "'Setting up' in fix_result.stdout"
 
-    - name: Check if Flatpak is installed
-      command: which flatpak
-      register: flatpak_check
-      failed_when: false
-      changed_when: false
-
-    - name: Update Flatpak packages
-      command: flatpak update -y
+    - name: Update system Flatpaks
+      command: flatpak update -y --noninteractive --system
       when: flatpak_check.rc == 0
-      register: flatpak_update
       failed_when: false
 
-    - name: Remove unused Flatpak packages
-      command: flatpak uninstall --unused -y
+    - name: Update user Flatpaks
+      command: flatpak update -y --noninteractive --user
+      become: false
+      when: flatpak_check.rc == 0
+      failed_when: false
+
+    - name: Remove unused Flatpaks
+      command: flatpak uninstall -y --noninteractive --unused
       when: flatpak_check.rc == 0
       failed_when: false