diff --git a/common/deploy-steps-tasks-step-0.j2.yaml b/common/deploy-steps-tasks-step-0.j2.yaml
index 4df9d24417..fa69689204 100644
--- a/common/deploy-steps-tasks-step-0.j2.yaml
+++ b/common/deploy-steps-tasks-step-0.j2.yaml
@@ -4,13 +4,13 @@
   when: "tripleo_minor_update is not defined or tripleo_minor_update != 'true'"
 - name: Create /var/lib/container-puppet
   no_log: True
-  file: path=/var/lib/container-puppet state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true
+  file: path=/var/lib/container-puppet state=directory setype=container_file_t selevel=s0 recurse=true
 - name: Write container-puppet.py
   no_log: True
   copy: src=docker_puppet_script.yaml dest=/var/lib/container-puppet/container-puppet.py force=yes mode=0600
 - name: Write container-puppet.sh
   no_log: True
-  copy: src=container_puppet_script.yaml dest=/var/lib/container-puppet/container-puppet.sh force=yes mode=0755
+  copy: src=container_puppet_script.yaml dest=/var/lib/container-puppet/container-puppet.sh force=yes mode=0755 setype=container_file_t
 
 {%- for role in roles %}
 - import_tasks: {{role.name}}/deploy_steps_tasks.yaml
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index d9391d47f8..94d86bad76 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -1584,7 +1584,7 @@ outputs:
                   copy: src=docker_puppet_script.yaml dest=/var/lib/container-puppet/container-puppet.py force=yes mode=0600
                 - name: Write container-puppet.sh
                   no_log: True
-                  copy: src=container_puppet_script.yaml dest=/var/lib/container-puppet/container-puppet.sh force=yes mode=0755
+                  copy: src=container_puppet_script.yaml dest=/var/lib/container-puppet/container-puppet.sh force=yes mode=0755 setype=container_file_t
                 - include_tasks: fast_forward_upgrade_prep_role_tasks.yaml
                   with_sequence: start=0 end={{fast_forward_upgrade_prep_steps_max}}
                   loop_control: