diff --git a/charts/activemq-artemis/templates/statefulsets.yaml b/charts/activemq-artemis/templates/statefulsets.yaml
index dc5e9a8..1a16f75 100644
--- a/charts/activemq-artemis/templates/statefulsets.yaml
+++ b/charts/activemq-artemis/templates/statefulsets.yaml
@@ -114,3 +114,9 @@ spec:
 {{- if .Values.extraVolumes }}
 {{ toYaml .Values.extraVolumes | indent 6 }}
 {{- end }}
+{{- if .Values.nodeSelector }}
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}