diff --git a/stable/ambassador/templates/deployment.yaml b/stable/ambassador/templates/deployment.yaml
index 60f32046e9..7ebcf450f1 100644
--- a/stable/ambassador/templates/deployment.yaml
+++ b/stable/ambassador/templates/deployment.yaml
@@ -17,7 +17,7 @@ metadata:
       {{- toYaml .Values.deploymentAnnotations | nindent 4 }}
     {{- end }}
 spec:
-{{- if not .Values.daemonSet }}
+{{- if and (not .Values.autoscaling.enabled) (not .Values.daemonSet) }}
   replicas: {{ .Values.replicaCount }}
 {{- end }}
   selector:
diff --git a/stable/postgresql/Chart.yaml b/stable/postgresql/Chart.yaml
index 793ef9105a..8a60039723 100644
--- a/stable/postgresql/Chart.yaml
+++ b/stable/postgresql/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: postgresql
-version: 7.7.0
+version: 7.7.1
 appVersion: 11.6.0
 description: Chart for PostgreSQL, an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance.
 keywords:
diff --git a/stable/postgresql/templates/networkpolicy.yaml b/stable/postgresql/templates/networkpolicy.yaml
index 1f91746f6a..ea1fc9b3a2 100644
--- a/stable/postgresql/templates/networkpolicy.yaml
+++ b/stable/postgresql/templates/networkpolicy.yaml
@@ -22,15 +22,15 @@ spec:
         - podSelector:
             matchLabels:
               {{ template "postgresql.fullname" . }}-client: "true"
+          {{- if .Values.networkPolicy.explicitNamespacesSelector }}
+          namespaceSelector:
+{{ toYaml .Values.networkPolicy.explicitNamespacesSelector | indent 12 }}
+          {{- end }}
         - podSelector:
             matchLabels:
               app: {{ template "postgresql.name" . }}
               release: {{ .Release.Name | quote }}
               role: slave
-        {{- if .Values.networkPolicy.explicitNamespacesSelector }}
-        - namespaceSelector:
-{{ toYaml .Values.networkPolicy.explicitNamespacesSelector | indent 12 }}
-        {{- end }}
       {{- end }}
     # Allow prometheus scrapes
     - ports:
diff --git a/stable/postgresql/values-production.yaml b/stable/postgresql/values-production.yaml
index 5a8b2c5109..e32ec5fec9 100644
--- a/stable/postgresql/values-production.yaml
+++ b/stable/postgresql/values-production.yaml
@@ -351,10 +351,10 @@ networkPolicy:
   ##
   allowExternal: true
 
-  ## if explicitNamespacesSelector is missing or set to {}, only Pods that are in the networkPolicy's namespace
-  ## and that match other criteria, the ones that can be selected by one of the podSelectors, can reach the DB.
-  ## But sometimes, we want the DB to be accessible from other namespaces, in this case, we can use this
-  ## LabelSelector to select these namespaces, note that the networkPolicy's should also be explicitly added.
+  ## if explicitNamespacesSelector is missing or set to {}, only client Pods that are in the networkPolicy's namespace
+  ## and that match other criteria, the ones that have the good label, can reach the DB.
+  ## But sometimes, we want the DB to be accessible to clients from other namespaces, in this case, we can use this
+  ## LabelSelector to select these namespaces, note that the networkPolicy's namespace should also be explicitly added.
   ##
   # explicitNamespacesSelector:
     # matchLabels:
diff --git a/stable/postgresql/values.yaml b/stable/postgresql/values.yaml
index 3d170ffd53..d15c571edf 100644
--- a/stable/postgresql/values.yaml
+++ b/stable/postgresql/values.yaml
@@ -359,10 +359,10 @@ networkPolicy:
   ##
   allowExternal: true
 
-  ## if explicitNamespacesSelector is missing or set to {}, only Pods that are in the networkPolicy's namespace
-  ## and that match other criteria, the ones that can be selected by one of the podSelectors, can reach the DB.
-  ## But sometimes, we want the DB to be accessible from other namespaces, in this case, we can use this
-  ## LabelSelector to select these namespaces, note that the networkPolicy's should also be explicitly added.
+  ## if explicitNamespacesSelector is missing or set to {}, only client Pods that are in the networkPolicy's namespace
+  ## and that match other criteria, the ones that have the good label, can reach the DB.
+  ## But sometimes, we want the DB to be accessible to clients from other namespaces, in this case, we can use this
+  ## LabelSelector to select these namespaces, note that the networkPolicy's namespace should also be explicitly added.
   ##
   # explicitNamespacesSelector:
     # matchLabels: