diff --git a/tenants/tenant-2/elasticsearch.yaml b/tenants/tenant-2/elasticsearch.yaml
index cd2324a..2cac92f 100644
--- a/tenants/tenant-2/elasticsearch.yaml
+++ b/tenants/tenant-2/elasticsearch.yaml
@@ -4,6 +4,8 @@ rootfs_size_mb: 2048
 node_type: "backend"
 vcpus: 2
 memory_mb: 4096
+# Keep the tenant-2 stack split across hosts when the cluster has capacity.
+anti_affinity_group: "tenant-2"
 kernel_args: "console=ttyS0 reboot=k panic=1 pci=off init=/sbin/fc-init /bin/tini -- /usr/local/bin/docker-entrypoint.sh eswrapper"
 network: true
 port_forwards:
diff --git a/tenants/tenant-2/kibana.yaml b/tenants/tenant-2/kibana.yaml
index 7b59248..ecc4431 100644
--- a/tenants/tenant-2/kibana.yaml
+++ b/tenants/tenant-2/kibana.yaml
@@ -4,6 +4,8 @@ rootfs_size_mb: 2048
 node_type: "web"
 vcpus: 2
 memory_mb: 4096
+# Keep the tenant-2 stack split across hosts when the cluster has capacity.
+anti_affinity_group: "tenant-2"
 kernel_args: "console=ttyS0 reboot=k panic=1 pci=off init=/sbin/fc-init /bin/tini -- /usr/local/bin/kibana-docker"
 network: true
 cross_node_links: