diff --git a/stable/stolon/Chart.yaml b/stable/stolon/Chart.yaml
index e0cd16435e..51306eb4aa 100644
--- a/stable/stolon/Chart.yaml
+++ b/stable/stolon/Chart.yaml
@@ -1,5 +1,5 @@
 name: stolon
-version: 0.2.2
+version: 0.3.0
 appVersion: 0.11.0
 description: Stolon - PostgreSQL cloud native High Availability.
 home: https://github.com/sorintlab/stolon
diff --git a/stable/stolon/README.md b/stable/stolon/README.md
index e927c015fc..aea0716e86 100644
--- a/stable/stolon/README.md
+++ b/stable/stolon/README.md
@@ -50,16 +50,19 @@ Kubernetes is the default store backend. `consul`, `etcdv2` or `etcdv3` can also
 | `ports`                                 | Ports to expose on pods                        | `{"stolon":{"containerPort": 5432},"metrics":{"containerPort": 8080}}`|
 | `keeper.replicaCount`                   | Number of keeper nodes                         | `2`                                                          |
 | `keeper.resources`                      | Keeper resource requests/limit                 | `{}`                                                         |
+| `keeper.priorityClassName`              | Keeper priorityClassName                       | `nil`                                                        |
 | `keeper.nodeSelector`                   | Node labels for keeper pod assignment          | `{}`                                                         |
 | `keeper.affinity`                       | Affinity settings for keeper pod assignment    | `{}`                                                         |
 | `keeper.tolerations`                    | Toleration labels for keeper pod assignment    | `[]`                                                         |
 | `proxy.replicaCount`                    | Number of proxy nodes                          | `2`                                                          |
 | `proxy.resources`                       | Proxy resource requests/limit                  | `{}`                                                         |
+| `proxy.priorityClassName`               | Proxy priorityClassName                        | `nil`                                                        |
 | `proxy.nodeSelector`                    | Node labels for proxy pod assignment           | `{}`                                                         |
 | `proxy.affinity`                        | Affinity settings for proxy pod assignment     | `{}`                                                         |
 | `proxy.tolerations`                     | Toleration labels for proxy pod assignment     | `[]`                                                         |
 | `sentinel.replicaCount`                 | Number of sentinel nodes                       | `2`                                                          |
 | `sentinel.resources`                    | Sentinel resource requests/limit               | `{}`                                                         |
+| `sentinel.priorityClassName`            | Sentinel priorityClassName                     | `nil`                                                        |
 | `sentinel.nodeSelector`                 | Node labels for sentinel pod assignment        | `{}`                                                         |
 | `sentinel.affinity`                     | Affinity settings for sentinel pod assignment  | `{}`                                                         |
 | `sentinel.tolerations`                  | Toleration labels for sentinel pod assignment  | `[]`                                                         |
diff --git a/stable/stolon/templates/keeper-statefulset.yaml b/stable/stolon/templates/keeper-statefulset.yaml
index 0ce60a2f82..d1c493e0a3 100644
--- a/stable/stolon/templates/keeper-statefulset.yaml
+++ b/stable/stolon/templates/keeper-statefulset.yaml
@@ -27,6 +27,9 @@ spec:
 {{ toYaml . | indent 8 }}
 {{- end }}
     spec:
+{{- if .Values.keeper.priorityClassName }}
+      priorityClassName: "{{ .Values.keeper.priorityClassName }}"
+{{- end }}
       serviceAccountName: {{ template "stolon.serviceAccountName" . }}
       terminationGracePeriodSeconds: 10
       containers:
diff --git a/stable/stolon/templates/proxy-deployment.yaml b/stable/stolon/templates/proxy-deployment.yaml
index e33d75c473..4e148d08f7 100644
--- a/stable/stolon/templates/proxy-deployment.yaml
+++ b/stable/stolon/templates/proxy-deployment.yaml
@@ -26,6 +26,9 @@ spec:
 {{ toYaml . | indent 8 }}
 {{- end }}
     spec:
+{{- if .Values.proxy.priorityClassName }}
+      priorityClassName: "{{ .Values.proxy.priorityClassName }}"
+{{- end }}
       serviceAccountName: {{ template "stolon.serviceAccountName" . }}
       containers:
         - name: {{ .Chart.Name }}
diff --git a/stable/stolon/templates/sentinel-deployment.yaml b/stable/stolon/templates/sentinel-deployment.yaml
index 6480f08f50..5b76656698 100644
--- a/stable/stolon/templates/sentinel-deployment.yaml
+++ b/stable/stolon/templates/sentinel-deployment.yaml
@@ -26,6 +26,9 @@ spec:
 {{ toYaml . | indent 8 }}
 {{- end }}
     spec:
+{{- if .Values.sentinel.priorityClassName }}
+      priorityClassName: "{{ .Values.sentinel.priorityClassName }}"
+{{- end }}
       serviceAccountName: {{ template "stolon.serviceAccountName" . }}
       containers:
         - name: {{ .Chart.Name }}
diff --git a/stable/stolon/values.yaml b/stable/stolon/values.yaml
index 7bf2e40537..49ad9fb703 100644
--- a/stable/stolon/values.yaml
+++ b/stable/stolon/values.yaml
@@ -60,6 +60,7 @@ keeper:
   replicaCount: 2
   annotations: {}
   resources: {}
+  priorityClassName: ""
   service:
     type: ClusterIP
     annotations: {}
@@ -76,6 +77,7 @@ proxy:
   replicaCount: 2
   annotations: {}
   resources: {}
+  priorityClassName: ""
   service:
     type: ClusterIP
 #    loadBalancerIP: ""
@@ -93,6 +95,7 @@ sentinel:
   replicaCount: 2
   annotations: {}
   resources: {}
+  priorityClassName: ""
   nodeSelector: {}
   affinity: {}
   tolerations: []