diff --git a/charts/templates/statefulset-timescaledb-accessnode.yaml b/charts/templates/statefulset-timescaledb-accessnode.yaml
index 4f401d1..fa0de3b 100644
--- a/charts/templates/statefulset-timescaledb-accessnode.yaml
+++ b/charts/templates/statefulset-timescaledb-accessnode.yaml
@@ -114,10 +114,8 @@ spec:
           subPath: "{{ .Values.persistentVolume.subPath }}"
         resources:
 {{ toYaml .Values.resources | indent 10 }}
-    # {{- with .Values.nodeSelector }}
-    #   nodeSelector:
+    {{- with .Values.nodeSelector }}
       nodeSelector:
-        kubernetes.io/hostname: an
 {{ toYaml . | indent 8 }}
     {{- end }}
     {{- with .Values.tolerations }}
@@ -127,13 +125,15 @@ spec:
     {{- if .Values.schedulerName }}
       schedulerName: {{ .Values.schedulerName }}
     {{- end }}
-    {{- if .Values.affinity }}
       affinity:
-{{ .Values.affinity | toYaml | indent 8 }}
-    {{- else if .Values.affinityTemplate }}
-      affinity:
-{{ tpl .Values.affinityTemplate . | indent 8 }}
-    {{- end }}
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: kubernetes.io/hostname
+                operator: In
+                values:
+                - an
       {{- if not .Values.persistentVolume.enabled }}
       - name: storage-volume
         emptyDir: {}
diff --git a/charts/templates/statefulset-timescaledb-datanode.yaml b/charts/templates/statefulset-timescaledb-datanode.yaml
index 2ee2a4e..bda9296 100644
--- a/charts/templates/statefulset-timescaledb-datanode.yaml
+++ b/charts/templates/statefulset-timescaledb-datanode.yaml
@@ -120,13 +120,15 @@ spec:
     {{- if .Values.schedulerName }}
       schedulerName: {{ .Values.schedulerName }}
     {{- end }}
-    {{- if .Values.affinity }}
       affinity:
-{{ .Values.affinity | toYaml | indent 8 }}
-    {{- else if .Values.affinityTemplate }}
-      affinity:
-{{ tpl .Values.affinityTemplate . | indent 8 }}
-    {{- end }}
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: kubernetes.io/hostname
+                operator: NotIn
+                values:
+                - an
       {{- if not .Values.persistentVolume.enabled }}
       - name: storage-volume
         emptyDir: {}