diff --git a/charts/polkadot-base-services/Chart.yaml b/charts/polkadot-base-services/Chart.yaml
index fa44584..dde541f 100644
--- a/charts/polkadot-base-services/Chart.yaml
+++ b/charts/polkadot-base-services/Chart.yaml
@@ -1,4 +1,4 @@
 description: Base services for Polkadot Node chart.
 name: polkadot-base-services
-version: v0.35.2
+version: v0.36.0
 apiVersion: v2
diff --git a/charts/polkadot-secrets/Chart.yaml b/charts/polkadot-secrets/Chart.yaml
index 241960c..09a9a58 100644
--- a/charts/polkadot-secrets/Chart.yaml
+++ b/charts/polkadot-secrets/Chart.yaml
@@ -1,4 +1,4 @@
 description: Polkadot secrets
 name: polkadot-secrets
-version: v0.35.2
+version: v0.36.0
 apiVersion: v2
diff --git a/charts/polkadot/Chart.yaml b/charts/polkadot/Chart.yaml
index ead0060..4e38b9c 100644
--- a/charts/polkadot/Chart.yaml
+++ b/charts/polkadot/Chart.yaml
@@ -1,4 +1,4 @@
 description: Polkadot Node chart.
 name: polkadot
-version: v0.35.2
+version: v0.36.0
 apiVersion: v2
diff --git a/charts/polkadot/templates/statefulset.yaml b/charts/polkadot/templates/statefulset.yaml
index 322d270..830a7d3 100644
--- a/charts/polkadot/templates/statefulset.yaml
+++ b/charts/polkadot/templates/statefulset.yaml
@@ -79,6 +79,14 @@ spec:
       imagePullSecrets:
       - name: {{ .Values.imagePullSecret.secretName }}
       {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}      
+      {{- end }}          
+      {{- if .Values.tolerations }}          
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+      {{- end }}          
       containers:
       - name: {{ .Release.Name }}
         image: {{ .Values.image.repo }}:{{ .Values.image.tag }}
@@ -193,6 +201,9 @@ spec:
     spec:
       {{- if .Values.persistence.enabled }}
       accessModes: {{ .Values.persistence.accessModes }}
+      {{- if .Values.persistence.storageClassName }}
+      storageClassName: {{ .Values.persistence.storageClassName }}
+      {{- end }}
       resources:
         requests:
           storage: {{ .Values.persistence.dataSize }}
diff --git a/charts/polkadot/values.yaml b/charts/polkadot/values.yaml
index 0c63411..27b35f6 100644
--- a/charts/polkadot/values.yaml
+++ b/charts/polkadot/values.yaml
@@ -1,6 +1,6 @@
 image:
   repo: parity/polkadot
-  tag: v0.9.17
+  tag: v0.9.19
 
 initImage:
   repo: web3f/polkadot-deployer
@@ -44,6 +44,7 @@ persistence:
   dataSize: 200Gi
   chainspecSize: 1Gi
   accessModes: [ "ReadWriteOnce" ]
+  #storageClassName: premium-rwo
 
 dnsNameservers:
 - 173.245.58.93
@@ -83,7 +84,7 @@ alertRulesLabels:
 serviceMonitorLabels:
   release: prometheus-operator
 
-inPeers: "500"
+# inPeers: "100"
 
 # imagePullSecret:
 #   secretName: docker-registry-secret          #k8s secret name
@@ -91,3 +92,6 @@ inPeers: "500"
 #     registry: registry.digitalocean.com       #docker registry url
 #     username: username                        #registry username
 #     password: password                        #registry password
+
+tolerations: []
+affinity: {}
\ No newline at end of file