diff --git a/k8s/apps/matrix/matrix-stack-values.yaml b/k8s/apps/matrix/matrix-stack-values.yaml
index 47f7191..6b8bfd2 100644
--- a/k8s/apps/matrix/matrix-stack-values.yaml
+++ b/k8s/apps/matrix/matrix-stack-values.yaml
@@ -60,8 +60,8 @@ synapse:
     storage:
       size: 20Gi
     maxUploadSize: 100M
-  # nodeSelector:
-  #   kubernetes.io/hostname: nas.homenet
+    nodeSelector:
+      kubernetes.io/hostname: master.tail2fe2d.ts.net
 
 ## Matrix Authentication Service
 matrixAuthenticationService:
@@ -88,24 +88,24 @@ matrixAuthenticationService:
     1-oidc:
       configSecret: matrix-oidc-config
       configSecretKey: mas-oidc.yaml
-  # nodeSelector:
-  #   kubernetes.io/hostname: nas.homenet
+    nodeSelector:
+      kubernetes.io/hostname: master.tail2fe2d.ts.net
 
 ## Element Web client
 elementWeb:
   enabled: true
   ingress:
     host: chat.matrix.hexor.cy
-  # nodeSelector:
-  #   kubernetes.io/hostname: nas.homenet
+  nodeSelector:
+    kubernetes.io/hostname: master.tail2fe2d.ts.net
 
 ## Element Admin panel
 elementAdmin:
   enabled: true
   ingress:
     host: admin.matrix.hexor.cy
-  # nodeSelector:
-  #   kubernetes.io/hostname: nas.homenet
+  nodeSelector:
+    kubernetes.io/hostname: master.tail2fe2d.ts.net
 
 ## Well-known delegation on the base domain (host is derived from serverName)
 wellKnownDelegation: