diff --git a/local.yml b/local.yml
index 9c93323..073c3c1 100644
--- a/local.yml
+++ b/local.yml
@@ -24,7 +24,9 @@
 
   roles:
     - name: fedora
-      when: ansible_distribution == 'Fedora'
+      when:
+        - ansible_distribution == 'Fedora'
+        - ansible_pkg_mgr == 'dnf5'
     - name: gnome
       when: ansible_env.DESKTOP_SESSION == 'gnome'
     - name: dotfiles
diff --git a/roles/fedora/tasks/main.yml b/roles/fedora/tasks/main.yml
index ba93223..149c0f9 100644
--- a/roles/fedora/tasks/main.yml
+++ b/roles/fedora/tasks/main.yml
@@ -6,61 +6,49 @@
   block:
     - name: "Add rpmfustion repo gpg keys"
       ansible.builtin.rpm_key:
-        key: "{{ rpmfusion_keys }}"
+        key: "{{ fedora_rpmfusion_keys }}"
         state: present
-      register: rpmfusion_keys_errors
 
     - name: "Install the rpmfusion repo packages"
       ansible.builtin.dnf:
-        name: "{{ rpmfusion_repos }}"
+        name: "{{ fedora_rpmfusion_repos }}"
         state: present
-      register: rpmfusion_repo_errors
 
   rescue:
     - name: "Log errors"
       ansible.builtin.lineinfile:
         dest: "{{ log_path }}"
         line: >-
-          [ERR] {{ item.msg }}
-      with_items:
-        - "{{ rpmfusion_keys_errors }}"
-        - "{{ rpmfusion_repo_errors }}"
+          [ERR] Error while adding rpmfusion repos
 
 - name: "Remove and install dnf software"
   become: true
   block:
     - name: "Remove unnecassary packages"
       ansible.builtin.dnf:
-        name: "{{ rem_packages }}"
+        name: "{{ fedora_rem_packages }}"
         state: absent
-      register: dnf_uninstall_errors
 
 
     - name: "Install all current updates"
       ansible.builtin.dnf:
         name: "*"
         state: latest
-      register: dnf_update_errors
 
     - name: "Install packages"
       ansible.builtin.dnf:
-        name: "{{ packages }}"
+        name: "{{ fedora_packages }}"
         state: present
-      register: dnf_install_errors
 
   rescue:
     - name: "Log errors"
       ansible.builtin.lineinfile:
         dest: "{{ log_path }}"
         line: >-
-          [ERR] {{ item }}
-      with_items:
-        - "{{ dnf_uninstall_errors }}"
-        - "{{ dnf_update_errors }}"
-        - "{{ dnf_install_errors.failures }}"
+          [ERR] Error while removing, updating or installing software.
 
 
 - name: "Install Flatpaks"
   flatpak:
-    name: "{{ flatpaks }}"
+    name: "{{ fedora_flatpaks }}"
     state: present
diff --git a/roles/fedora/vars/main.yml b/roles/fedora/vars/main.yml
index c41e76c..1ecdb67 100644
--- a/roles/fedora/vars/main.yml
+++ b/roles/fedora/vars/main.yml
@@ -1,25 +1,22 @@
 ---
 # vars file for fedora
 
-rpmfusion_keys_errors: ""
-rpmfusion_repo_errors: ""
-
-rpmfusion_keys:
+fedora_rpmfusion_keys:
   - "https://rpmfusion.org/keys?action=AttachFile&do=get&target=RPM-GPG-KEY-rpmfusion-free-fedora-2020"
   - "https://rpmfusion.org/keys?action=AttachFile&do=get&target=RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020"
 
-rpmfusion_repos:
+fedora_rpmfusion_repos:
   - http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm
   - http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm
 
-rem_packages:
+fedora_rem_packages:
   - gnome-tour
   - mediawriter
   - totem
 #  - libreoffice*
   - rhythmbox
 
-packages:
+fedora_packages:
   - vim
   - helix
   - flatpak
@@ -35,7 +32,7 @@ packages:
   - python-psutil
   - tldr
 
-flatpaks:
+fedora_flatpaks:
   - com.vscodium.codium
   - com.nextcloud.desktopclient.nextcloud
   - com.logseq.Logseq