diff --git a/roles/sys-bkp-docker-2-loc/tasks/01_pkgmgr_routines.yml b/roles/sys-bkp-docker-2-loc/tasks/01_pkgmgr_routines.yml
index ebe8f584..663d1e86 100644
--- a/roles/sys-bkp-docker-2-loc/tasks/01_pkgmgr_routines.yml
+++ b/roles/sys-bkp-docker-2-loc/tasks/01_pkgmgr_routines.yml
@@ -1,17 +1,19 @@
 - block:
-  - name: "pkgmgr install {{ bkp_docker_to_local_pkg }}"
-    include_role:
-      name: pkgmgr-install
-    vars:
-      package_name: "{{ bkp_docker_to_local_pkg }}"
+    - name: "pkgmgr install {{ bkp_docker_to_local_pkg }}"
+      include_role:
+        name: pkgmgr-install
+      vars:
+        package_name: "{{ bkp_docker_to_local_pkg }}"
 
-  - name: "Retrieve {{ bkp_docker_to_local_pkg }} path from pkgmgr"
-    command: "pkgmgr path {{ bkp_docker_to_local_pkg }}"
-    register: pkgmgr_output
-    changed_when: false
+    - name: "Retrieve {{ bkp_docker_to_local_pkg }} path from pkgmgr"
+      command: "pkgmgr path {{ bkp_docker_to_local_pkg }}"
+      register: pkgmgr_output
+      changed_when: false
 
-  - name: Set fact for backup_docker_to_local_folder
-    set_fact:
-      backup_docker_to_local_folder: "{{ pkgmgr_output.stdout }}/"
-    changed_when: false
+    - name: Set fact for backup_docker_to_local_folder
+      set_fact:
+        backup_docker_to_local_folder: "{{ pkgmgr_output.stdout }}/"
+      changed_when: false
   when: backup_docker_to_local_folder is not defined
+  vars:
+    bkp_docker_to_local_pkg: backup-docker-to-local
diff --git a/roles/sys-bkp-docker-2-loc/vars/main.yml b/roles/sys-bkp-docker-2-loc/vars/main.yml
index 1f69106e..ff2532aa 100644
--- a/roles/sys-bkp-docker-2-loc/vars/main.yml
+++ b/roles/sys-bkp-docker-2-loc/vars/main.yml
@@ -1,5 +1,3 @@
-bkp_docker_to_local_pkg: backup-docker-to-local
-
 # Mapping logic for backup-docker-to-local CLI arguments
 #
 # - bkp_docker_to_local_database_routine:    All service names where backup.database_routine is set (for --database-containers)