diff --git a/common/deploy-steps-playbooks-common.yaml b/common/deploy-steps-playbooks-common.yaml
index a0a31c00e2..be34e7cc3b 100644
--- a/common/deploy-steps-playbooks-common.yaml
+++ b/common/deploy-steps-playbooks-common.yaml
@@ -34,30 +34,6 @@
   tags:
     - always
 
-- hosts: "{{ deploy_target_host }}"
-  strategy: tripleo_linear
-  name: Ensure /var/lib/config-data context
-  become: true
-  gather_facts: false
-  any_errors_fatal: false
-  ignore_unreachable: true
-  tasks:
-    - name: Ensure /var/lib/config-data context
-      shell: |-
-        set -o pipefail
-        if [[ -e /var/lib/config-data ]]; then
-          chcon -R -t svirt_sandbox_file_t /var/lib/config-data
-        exit 2
-        fi
-      args:
-        executable: /bin/bash
-        warn: no
-      register: _selinux_config_data
-      changed_when: _selinux_config_data.rc == 2
-      failed_when: _selinux_config_data.rc not in [0,2]
-  tags:
-    - always
-
 - hosts: "{{ deploy_target_host }}"
   name: Render all_nodes data as group_vars for overcloud
   gather_facts: "{{ gather_facts | default(false) }}"
diff --git a/common/generate-config-tasks.yaml b/common/generate-config-tasks.yaml
index f41427e6d2..2acaaa3924 100644
--- a/common/generate-config-tasks.yaml
+++ b/common/generate-config-tasks.yaml
@@ -52,7 +52,7 @@
         path: "/var/lib/tripleo-config/container-puppet-config"
         mode: 0700
         recurse: true
-        setype: svirt_sandbox_file_t
+        setype: container_file_t
 
     - name: "Generate container puppet configs for step {{ step }}"
       container_puppet_config: