diff --git a/charts/activemq-artemis/Chart.yaml b/charts/activemq-artemis/Chart.yaml
index a83961f..9c6768e 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.1.0
 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..70824a0 100644
--- a/charts/activemq-artemis/templates/statefulsets.yaml
+++ b/charts/activemq-artemis/templates/statefulsets.yaml
@@ -26,6 +26,14 @@ spec:
         prometheus.io/port: '9404'
         prometheus.io/scrape: 'true'
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations:
+        {{- toYaml .Values.tolerations | nindent 8 }}
+      {{- end }}
       {{- if .Values.imagePullSecret }}
       imagePullSecrets:
         - name: {{ .Values.imagePullSecret }}
diff --git a/charts/gxf/Chart.yaml b/charts/gxf/Chart.yaml
index 2605977..196ec5a 100644
--- a/charts/gxf/Chart.yaml
+++ b/charts/gxf/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: gxf
 description: Generic GXF Helm chart
-version: '1.5.39'
+version: '1.6.0'
 icon: https://artwork.lfenergy.org/projects/grid-exchange-fabric/abbrev/color/grid-exchange-fabric-abbrev-color.png
 maintainers:
   - name: OSGP
diff --git a/charts/gxf/templates/deployment.yaml b/charts/gxf/templates/deployment.yaml
index 64f300c..dd42ba5 100644
--- a/charts/gxf/templates/deployment.yaml
+++ b/charts/gxf/templates/deployment.yaml
@@ -34,6 +34,10 @@ spec:
       nodeSelector:
       {{- toYaml .Values.nodeSelector | nindent 8 }}
       {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations:
+        {{- toYaml .Values.tolerations | nindent 8 }}
+      {{- end }}
       serviceAccountName: {{ .Values.serviceAccount.name }}
       {{- if .Values.imagePullSecret }}
       imagePullSecrets: