diff --git a/roles/fedora_gnome_workstation/tasks/main.yml b/roles/fedora_gnome_workstation/tasks/main.yml
index bdb2c7b..1113b55 100644
--- a/roles/fedora_gnome_workstation/tasks/main.yml
+++ b/roles/fedora_gnome_workstation/tasks/main.yml
@@ -152,7 +152,7 @@
   ansible.builtin.copy:
     src: files/OpenBar.cfg
     dest: "/tmp/OpenBar.cfg"
-    mode: '0644'
+    mode: "0644"
   become: false
 
 - name: Import OpenBar configuration using dconf
@@ -160,27 +160,11 @@
   become: false
   changed_when: true
 
-- name: Ensure flatpak is installed
-  ansible.builtin.dnf:
-    name:
-      - flatpak
-    state: present
-  become: true
-
-- name: Add flathub repository
-  community.general.flatpak_remote:
-    name: flathub
-    state: present
-    flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo
-  become: true
-
 - name: Install flatpak applications from flathub
   community.general.flatpak:
     name:
       - com.mattjakeman.ExtensionManager
-      - com.github.tchx84.Flatseal
       - org.gnome.Evolution
-      - org.keepassxc.KeePassXC
       - com.belmoussaoui.Authenticator
       - org.gnome.World.Secrets
     state: present
diff --git a/roles/fedora_workstation/tasks/main.yml b/roles/fedora_workstation/tasks/main.yml
index 18904ec..fdb977a 100644
--- a/roles/fedora_workstation/tasks/main.yml
+++ b/roles/fedora_workstation/tasks/main.yml
@@ -1,6 +1,25 @@
 ---
 # tasks file for fedora_workstation
 
+- name: Install RPM Fusion Free repository
+  ansible.builtin.dnf:
+    name: "https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm"
+    state: present
+    disable_gpg_check: false
+  become: true
+
+- name: Install RPM Fusion Nonfree repository
+  ansible.builtin.dnf:
+    name: "https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm"
+    state: present
+    disable_gpg_check: false
+  become: true
+
+- name: Update package cache after adding RPM Fusion
+  ansible.builtin.dnf:
+    update_cache: true
+  become: true
+
 - name: Ensure essential packages are installed
   ansible.builtin.dnf:
     name:
@@ -9,3 +28,26 @@
       - wget
     state: present
   become: true
+
+- name: Ensure flatpak is installed
+  ansible.builtin.dnf:
+    name:
+      - flatpak
+    state: present
+  become: true
+
+- name: Add flathub repository
+  community.general.flatpak_remote:
+    name: flathub
+    state: present
+    flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo
+  become: true
+
+- name: Install flatpak applications from flathub
+  community.general.flatpak:
+    name:
+      - com.github.tchx84.Flatseal
+      - org.keepassxc.KeePassXC
+    state: present
+    remote: flathub
+  become: true