diff --git a/charts/activemq-artemis/Chart.yaml b/charts/activemq-artemis/Chart.yaml
index a83961f..c838ad6 100644
--- a/charts/activemq-artemis/Chart.yaml
+++ b/charts/activemq-artemis/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: activemq-artemis
-version: 0.0.30
+version: 0.0.31
 description: a multi-protocol, embeddable, very high performance, clustered, asynchronous messaging system.
 keywords:
 - activemq
diff --git a/charts/activemq-artemis/templates/statefulsets.yaml b/charts/activemq-artemis/templates/statefulsets.yaml
index d767311..020cc52 100644
--- a/charts/activemq-artemis/templates/statefulsets.yaml
+++ b/charts/activemq-artemis/templates/statefulsets.yaml
@@ -142,3 +142,9 @@ spec:
 {{- if .Values.extraVolumes }}
 {{ toYaml .Values.extraVolumes | indent 8 }}
 {{- end }}
+{{- if .Values.nodeSelector }}
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}