diff --git a/apps/base/mastodon/release.yaml b/apps/base/mastodon/release.yaml
index 0faed1bc98b2583ad3310c520bb892f2bf7404cb..c826a41a118132a9e92861109fd7116430adce26 100644
--- a/apps/base/mastodon/release.yaml
+++ b/apps/base/mastodon/release.yaml
@@ -73,12 +73,27 @@ spec:
               name: mastodon-streaming
             spec:
               replicas: 2
+              affinity:
+                podAntiAffinity:
+                  requiredDuringSchedulingIgnoredDuringExecution:
+                    - labelSelector:
+                        matchLabels:
+                          app.kubernetes.io/component: streaming
+                      topologyKey: kubernetes.io/hostname
           - kind: Deployment
             apiVersion: apps/v1
             metadata:
               name: mastodon-web
             spec:
               replicas: 2
+              affinity:
+                podAntiAffinity:
+                  requiredDuringSchedulingIgnoredDuringExecution:
+                    - labelSelector:
+                        matchLabels:
+                          app.kubernetes.io/component: web
+                          app.kubernetes.io/part-of: rails
+                      topologyKey: kubernetes.io/hostname
           - kind: ConfigMap
             apiVersion: v1
             metadata: