diff --git a/deployment/haproxy/haproxy-container-puppet.yaml b/deployment/haproxy/haproxy-container-puppet.yaml
index 29941213af..7a0d84c024 100644
--- a/deployment/haproxy/haproxy-container-puppet.yaml
+++ b/deployment/haproxy/haproxy-container-puppet.yaml
@@ -252,7 +252,8 @@ outputs:
               image: {get_param: ContainerHAProxyImage}
               net: host
               restart: always
-              security_opt: label=disable
+              security_opt:
+                - label=disable
               volumes:
                 list_concat:
                   - {get_attr: [ContainersCommon, volumes]}
diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml
index 7f2ed1b46a..ce3ec2b51f 100644
--- a/deployment/ironic/ironic-pxe-container-puppet.yaml
+++ b/deployment/ironic/ironic-pxe-container-puppet.yaml
@@ -146,7 +146,8 @@ outputs:
             image: *ironic_pxe_image
             net: host
             privileged: false
-            security_opt: 'label=disable'
+            security_opt:
+              - label=disable
             restart: always
             healthcheck:
               test: /openstack/healthcheck
diff --git a/deployment/logging/rsyslog-container-puppet.yaml b/deployment/logging/rsyslog-container-puppet.yaml
index f3c41e01c8..cf44fc8a3e 100644
--- a/deployment/logging/rsyslog-container-puppet.yaml
+++ b/deployment/logging/rsyslog-container-puppet.yaml
@@ -243,7 +243,8 @@ outputs:
             privileged: true
             user: root
             restart: always
-            security_opt: 'label=disable'
+            security_opt:
+              - label=disable
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
diff --git a/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml b/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml
index ad442ed38b..4d3270ac8a 100644
--- a/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml
+++ b/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml
@@ -98,7 +98,8 @@ outputs:
             pid: host
             user: root
             privileged: true
-            security_opt: 'label=disable'
+            security_opt:
+              - label=disable
             command:
               - puppet
               - apply
diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml
index 4e1cd77569..200a4cfaaa 100644
--- a/deployment/neutron/neutron-dhcp-container-puppet.yaml
+++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml
@@ -321,7 +321,8 @@ outputs:
             pid: host
             privileged: true
             restart: always
-            security_opt: 'label=disable'
+            security_opt:
+              - label=disable
             depends_on:
               - openvswitch.service
             healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
diff --git a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml b/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml
index 4edad08ddb..a33b1694e4 100644
--- a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml
@@ -153,7 +153,8 @@ outputs:
             pid: host
             user: root
             privileged: true
-            security_opt: 'label=disable'
+            security_opt:
+              - label=disable
             command:
               - puppet
               - apply
diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
index 82c915cd95..1b14a549d9 100644
--- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
@@ -306,7 +306,8 @@ outputs:
             pid: host
             user: root
             privileged: true
-            security_opt: 'label=disable'
+            security_opt:
+              - label=disable
             command:
               - puppet
               - apply
@@ -337,7 +338,8 @@ outputs:
             net: host
             pid: host
             privileged: true
-            security_opt: 'label=disable'
+            security_opt:
+              - label=disable
             restart: always
             depends_on:
               - openvswitch.service
diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index 482b28b900..971d0fe3be 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -1320,7 +1320,8 @@ outputs:
             image: &nova_compute_image {get_param: ContainerNovaComputeImage}
             net: none
             user: root
-            security_opt: label=disable
+            security_opt:
+              - label=disable
             privileged: false
             detach: false
             volumes:
diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml
index 8addde3883..910eb5169b 100644
--- a/deployment/nova/nova-ironic-container-puppet.yaml
+++ b/deployment/nova/nova-ironic-container-puppet.yaml
@@ -141,7 +141,8 @@ outputs:
             image: &nova_ironic_image {get_param: ContainerNovaComputeIronicImage}
             net: none
             user: root
-            security_opt: label=disable
+            security_opt:
+              - label=disable
             privileged: false
             detach: false
             volumes:
diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml
index 8f00b97f12..2c4a6429e8 100644
--- a/deployment/nova/nova-libvirt-container-puppet.yaml
+++ b/deployment/nova/nova-libvirt-container-puppet.yaml
@@ -639,7 +639,8 @@ outputs:
                     ulimit: {get_param: ContainerNovaLibvirtUlimit}
                     net: host
                     pid: host
-                    security_opt: label=disable
+                    security_opt:
+                      - label=disable
                     privileged: true
                     restart: always
                     healthcheck:
@@ -777,7 +778,8 @@ outputs:
             - nova_libvirt_init_secret:
                 detach: false
                 image: {get_param: ContainerNovaLibvirtImage}
-                security_opt: label=disable
+                security_opt:
+                  - label=disable
                 privileged: false
                 user: root
                 net: host
diff --git a/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml b/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml
index 6c25fbbb8c..91ee52c818 100644
--- a/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml
+++ b/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml
@@ -54,7 +54,8 @@ outputs:
             net: host
             pid: host
             privileged: true
-            security_opt: 'label=disable'
+            security_opt:
+              - label=disable
             restart: always
             depends_on:
               - openvswitch.service