diff --git a/roles/copr/backend/files/provision/builderpb-aws.yml b/roles/copr/backend/files/provision/builderpb-aws.yml
index 82558e1b29..8302fa79d3 100644
--- a/roles/copr/backend/files/provision/builderpb-aws.yml
+++ b/roles/copr/backend/files/provision/builderpb-aws.yml
@@ -16,11 +16,7 @@
     when:
     - prepare_base_image is defined
 
-  - import_tasks: "libdnf5.yml"
-
-  - name: "Work-around for https://github.com/ansible/ansible/issues/84206 #2 (reload remote python modules)"
-    meta: reset_connection
-    when:
-      - prepare_base_image is defined
+  - include_tasks: "libdnf5.yml"
+    when: prepare_base_image is defined
 
   - include_tasks: "provision_builder_tasks.yml"
diff --git a/roles/copr/backend/files/provision/libdnf5.yml b/roles/copr/backend/files/provision/libdnf5.yml
index 75742698f7..171c92557a 100644
--- a/roles/copr/backend/files/provision/libdnf5.yml
+++ b/roles/copr/backend/files/provision/libdnf5.yml
@@ -1,10 +1,6 @@
 ---
 - name: "Work-around for https://github.com/ansible/ansible/issues/84206 #1 (install python3 libdnf5)"
   shell: dnf -y install python3-libdnf5
-  when:
-    - prepare_base_image is defined
 
 - name: "Work-around for https://github.com/ansible/ansible/issues/84206 #2 (reload remote python modules)"
   meta: reset_connection
-  when:
-    - prepare_base_image is defined
diff --git a/roles/copr/backend/files/provision/local-image-update.yml b/roles/copr/backend/files/provision/local-image-update.yml
index a520c80b8c..93624ce238 100644
--- a/roles/copr/backend/files/provision/local-image-update.yml
+++ b/roles/copr/backend/files/provision/local-image-update.yml
@@ -16,6 +16,7 @@
     ansible_python_interpreter: /usr/bin/python3
 
   tasks:
-  - import_tasks: "libdnf5.yml"
+  - include_tasks: "libdnf5.yml"
+    when: prepare_base_image is defined
   - import_tasks: "create_swap_file.yml"
   - import_tasks: "provision_builder_tasks.yml"