diff --git a/roles/upgrade/tasks/disable-previous-repo-files.yml b/roles/upgrade/tasks/disable-previous-repo-files.yml
index f84f972..b6e8ea2 100644
--- a/roles/upgrade/tasks/disable-previous-repo-files.yml
+++ b/roles/upgrade/tasks/disable-previous-repo-files.yml
@@ -1,18 +1,24 @@
 ---
-- name: disable-previous-repo-files | Backup repo files
-  ansible.builtin.copy:
-    remote_src: true
-    src: "/etc/yum.repos.d/{{ item }}"
-    dest: "/etc/yum.repos.d/{{ item }}.{{ ansible_date_time.iso8601_basic_short }}"
-    owner: root
-    group: root
-    mode: "0644"
-  loop: "{{ __repo_files }}"
+- name: disable-previous-repo-files | Stat repo file
+  ansible.builtin.stat:
+    path: /etc/yum.repos.d/{{ item }}
+  register: __repo_file_stat
 
-- name: disable-previous-repo-files | Remove repo files
-  ansible.builtin.file:
-    path: "/etc/yum.repos.d/{{ item }}"
-    state: absent
-  loop: "{{ __repo_files }}"
+- name: disable-previous-repo-files | Block to backup and remove repo file if found
+  when: __repo_file_stat.stat.exists
+  block:
+    - name: disable-previous-repo-files | Backup repo files
+      ansible.builtin.copy:
+        remote_src: true
+        src: /etc/yum.repos.d/{{ item }}
+        dest: /etc/yum.repos.d/{{ item }}.{{ ansible_date_time.iso8601_basic_short }}
+        owner: root
+        group: root
+        mode: "0644"
+
+    - name: disable-previous-repo-files | Remove repo files
+      ansible.builtin.file:
+        path: /etc/yum.repos.d/{{ item }}
+        state: absent
 
 ...
diff --git a/roles/upgrade/tasks/leapp-upgrade.yml b/roles/upgrade/tasks/leapp-upgrade.yml
index a3efd8d..8fda0c9 100644
--- a/roles/upgrade/tasks/leapp-upgrade.yml
+++ b/roles/upgrade/tasks/leapp-upgrade.yml
@@ -46,8 +46,8 @@
 
 - name: leapp-upgrade | Include disable-previous-repo-files.yml
   ansible.builtin.include_tasks: disable-previous-repo-files.yml
-  vars:
-    __repo_files: "{{ repo_files_to_remove_at_upgrade }}"
+  loop:
+    "{{ repo_files_to_remove_at_upgrade }}"
   when: leapp_upgrade_type == "custom"
 
 - name: leapp-upgrade | Start Leapp OS upgrade
diff --git a/roles/upgrade/tasks/redhat-upgrade-tool-upgrade.yml b/roles/upgrade/tasks/redhat-upgrade-tool-upgrade.yml
index 8c75d79..642dce1 100644
--- a/roles/upgrade/tasks/redhat-upgrade-tool-upgrade.yml
+++ b/roles/upgrade/tasks/redhat-upgrade-tool-upgrade.yml
@@ -48,9 +48,8 @@
 # So upgrade-and-reboot.yml can succed.
 - name: redhat-upgrade-tool-upgrade | Disable redhat-upgrade-cmdline-instrepo.repo
   ansible.builtin.include_tasks: disable-previous-repo-files.yml
-  vars:
-    __repo_files:
-      - redhat-upgrade-cmdline-instrepo.repo
+  loop:
+    - redhat-upgrade-cmdline-instrepo.repo
   when: leapp_upgrade_type == "custom"
 
 - name: redhat-upgrade-tool-upgrade | Include update-and-reboot.yml
@@ -64,8 +63,7 @@
 
 - name: redhat-upgrade-tool-upgrade | Include disable-previous-repo-files.yml
   ansible.builtin.include_tasks: disable-previous-repo-files.yml
-  vars:
-    __repo_files: "{{ repo_files_to_remove_at_upgrade }}"
+  loop: "{{ repo_files_to_remove_at_upgrade }}"
   when: leapp_upgrade_type == "custom"
 
 - name: Install RPM Key for RHEL 7 ISO Repository