diff --git a/etc/openstack_deploy/conf.d/swift.yml.aio b/etc/openstack_deploy/conf.d/swift.yml.aio
index dae9fbcceb..a4595ac3a9 100644
--- a/etc/openstack_deploy/conf.d/swift.yml.aio
+++ b/etc/openstack_deploy/conf.d/swift.yml.aio
@@ -19,6 +19,7 @@ swift-proxy_hosts:
     ip: 172.29.236.100
     container_vars:
       swift_proxy_vars:
+        limit_container_types: swift_proxy
         read_affinity: "r1=100"
         write_affinity: "r1"
         write_affinity_node_count: "1 * replicas"
@@ -27,5 +28,6 @@ swift_hosts:
     ip: 172.29.236.100
     container_vars:
       swift_vars:
+        limit_container_types: swift
         zone: 0
         region: 1
diff --git a/playbooks/inventory/dynamic_inventory.py b/playbooks/inventory/dynamic_inventory.py
index f1209ce2a4..417c5e534a 100755
--- a/playbooks/inventory/dynamic_inventory.py
+++ b/playbooks/inventory/dynamic_inventory.py
@@ -272,7 +272,7 @@ def _append_to_host_groups(inventory, container_type, assignment, host_type,
                                     'limit_container_types', None
                                 )
 
-                        if limit is None or limit in container:
+                        if limit is None or (component and limit in component):
                             hdata[_keys] = options