diff --git a/pkg/comp-functions/functions/vshnpostgrescnpg/deploy.go b/pkg/comp-functions/functions/vshnpostgrescnpg/deploy.go
index 4f7ab1e423..f73ebd9974 100644
--- a/pkg/comp-functions/functions/vshnpostgrescnpg/deploy.go
+++ b/pkg/comp-functions/functions/vshnpostgrescnpg/deploy.go
@@ -278,6 +278,9 @@ func createCnpgHelmValues(ctx context.Context, svc *runtime.ServiceRuntime, comp
 				"serverCASecret":  certificateSecretName,
 				"serverTLSSecret": certificateSecretName,
 			},
+			"affinity": map[string]any{
+				"topologyKey": "kubernetes.io/hostname",
+			},
 			// The following will be overwritten by setResources() later
 			"storage": map[string]any{},
 			"resources": map[string]any{