diff --git a/src/ansible/roles/packages/tasks/Fedora.yml b/src/ansible/roles/packages/tasks/Fedora.yml
index c3aed92..cfb53b0 100644
--- a/src/ansible/roles/packages/tasks/Fedora.yml
+++ b/src/ansible/roles/packages/tasks/Fedora.yml
@@ -67,11 +67,12 @@
 
 - name: Install extended set of packages
   block:
-  - name: Install additional repositories
-    shell: |
-      dnf config-manager --add-repo {{ item }}
-    with_items:
-    - https://cli.github.com/packages/rpm/gh-cli.repo
+  - name: Add gh-cli.repo repo
+    ansible.builtin.get_url:
+      url: https://cli.github.com/packages/rpm/gh-cli.repo
+      dest: /etc/yum.repos.d/gh-cli.repo
+      mode: '0644'
+
   - name: Install additional packages
     dnf:
       state: present
@@ -124,10 +125,10 @@
       - nfs-utils
       - realmd
       - sssd
-      - sssd-*
+      - 'sssd-\*'
 
   - name: Install debug information for selected packages
-    command: dnf debuginfo-install  -y  {{ item }}
+    command: dnf install --enablerepo='*-debug*'  -y {{ item }}-debuginfo
     with_items:
       - dbus
       - glibc
diff --git a/src/build.sh b/src/build.sh
index 9cc60dd..18b9bda 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -68,9 +68,9 @@ function base_install_python {
     fi
   fi
 
-  # Remove dnf-5 to workaround many issues that yet needs to be fixed
+  # Add python3-dnf5 to enable ansible to use it
   if base_exec '[ -f /usr/bin/dnf5 ]'; then
-    base_exec 'dnf install -y python3-dnf && dnf remove -y dnf5 && ln -s /usr/bin/dnf-3 /usr/bin/dnf && ln -s /usr/bin/dnf-3 /usr/bin/yum && dnf clean all'
+    base_exec 'dnf install -y python3-libdnf5 dnf5-plugins'
   fi
 }