diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml
index d61c150e46..e62474c9ad 100644
--- a/deployment/cinder/cinder-api-container-puppet.yaml
+++ b/deployment/cinder/cinder-api-container-puppet.yaml
@@ -222,7 +222,7 @@ outputs:
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: cinder
-        puppet_tags: cinder_config,cinder_type,file,concat,file_line
+        puppet_tags: cinder_config,cinder_type,file,concat,file_line,cinder_api_paste_ini
         step_config:
           list_join:
             - "\n"
diff --git a/deployment/designate/designate-api-container-puppet.yaml b/deployment/designate/designate-api-container-puppet.yaml
index 469035af78..8cce8ffaa2 100644
--- a/deployment/designate/designate-api-container-puppet.yaml
+++ b/deployment/designate/designate-api-container-puppet.yaml
@@ -128,7 +128,7 @@ outputs:
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: designate
-        puppet_tags: designate_config
+        puppet_tags: designate_config,designate_api_paste_ini
         step_config: |
           include tripleo::profile::base::designate::api
         config_image: {get_param: ContainerDesignateConfigImage}
diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml
index faa41f2df0..7049173261 100644
--- a/deployment/heat/heat-api-container-puppet.yaml
+++ b/deployment/heat/heat-api-container-puppet.yaml
@@ -181,7 +181,7 @@ outputs:
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: heat_api
-        puppet_tags: heat_config,file,concat,file_line
+        puppet_tags: heat_config,file,concat,file_line,heat_api_paste_ini
         step_config: |
           include tripleo::profile::base::heat::api
         config_image: {get_param: ContainerHeatApiConfigImage}
diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml
index ddc095d470..d090cc4a80 100644
--- a/deployment/neutron/neutron-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-api-container-puppet.yaml
@@ -418,7 +418,7 @@ outputs:
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: neutron
-        puppet_tags: neutron_config,neutron_api_config
+        puppet_tags: neutron_config,neutron_api_paste_ini
         step_config:
           list_join:
             - "\n"
diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml
index 840d2e3e9d..7093080bef 100644
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/deployment/nova/nova-api-container-puppet.yaml
@@ -419,7 +419,7 @@ outputs:
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: nova
-        puppet_tags: nova_config
+        puppet_tags: nova_config,nova_api_paste_ini
         step_config:
           list_join:
             - "\n"
diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index e46cdf1f9a..d7d8fbe527 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -1194,7 +1194,7 @@ outputs:
           collectd::plugin::virt::connection: 'qemu:///system'
       puppet_config:
         config_volume: nova_libvirt
-        puppet_tags: nova_config,nova_paste_api_ini
+        puppet_tags: nova_config
         step_config: |
           # TODO(emilien): figure how to deal with libvirt profile.
           # We'll probably treat it like we do with Neutron plugins.
diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml
index 7d79b64a2d..fce4edb2bf 100644
--- a/deployment/nova/nova-ironic-container-puppet.yaml
+++ b/deployment/nova/nova-ironic-container-puppet.yaml
@@ -108,7 +108,7 @@ outputs:
                 - get_param: IronicApiMaxRetries
       puppet_config:
         config_volume: nova
-        puppet_tags: nova_config,nova_paste_api_ini
+        puppet_tags: nova_config
         step_config: |
           include tripleo::profile::base::nova::compute::ironic
         config_image: {get_param: ContainerNovaConfigImage}
diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml
index a110ff57b9..49e24f2952 100644
--- a/deployment/nova/nova-metadata-container-puppet.yaml
+++ b/deployment/nova/nova-metadata-container-puppet.yaml
@@ -202,7 +202,7 @@ outputs:
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: nova_metadata
-        puppet_tags: nova_config
+        puppet_tags: nova_config,nova_api_paste_ini
         step_config:
           list_join:
             - "\n"