diff --git a/common/deploy-steps-playbooks-common.yaml b/common/deploy-steps-playbooks-common.yaml
index f021904678..eb5dbf4968 100644
--- a/common/deploy-steps-playbooks-common.yaml
+++ b/common/deploy-steps-playbooks-common.yaml
@@ -22,8 +22,15 @@
   tasks:
     - include_vars: global_vars.yaml
       no_log: true
+  tags:
+    - always
 
-    - name: ensure we get the right selinux context
+- hosts: "{{ deploy_target_host }}"
+  name: Ensure /var/lib/config-data context
+  gather_facts: false
+  any_errors_fatal: yes
+  tasks:
+    - name: Ensure /var/lib/config-data context
       shell: |-
         set -o pipefail
         if [[ -e /var/lib/config-data ]]; then