diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml
index c45157db11..94b74a198a 100644
--- a/deployment/cinder/cinder-api-container-puppet.yaml
+++ b/deployment/cinder/cinder-api-container-puppet.yaml
@@ -224,7 +224,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 d5c8e9e8fd..c15e49b327 100644
--- a/deployment/designate/designate-api-container-puppet.yaml
+++ b/deployment/designate/designate-api-container-puppet.yaml
@@ -129,7 +129,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 e601161cf2..db1e4353c9 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 6091e00061..9714991cc3 100644
--- a/deployment/neutron/neutron-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-api-container-puppet.yaml
@@ -410,7 +410,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 95dcb74169..cf70b7402e 100644
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/deployment/nova/nova-api-container-puppet.yaml
@@ -426,7 +426,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 d7bf22e13d..457d0aff95 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -1218,7 +1218,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 35c2d325ab..763183d4bf 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 4a8bda583a..96d1af0dcc 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"