diff --git a/stable/joomla/Chart.yaml b/stable/joomla/Chart.yaml
index 7eb3be99b2..0e195a0fc7 100644
--- a/stable/joomla/Chart.yaml
+++ b/stable/joomla/Chart.yaml
@@ -1,5 +1,5 @@
 name: joomla
-version: 3.0.3
+version: 3.1.0
 appVersion: 3.8.12
 description: PHP content management system (CMS) for publishing web content
 keywords:
diff --git a/stable/joomla/README.md b/stable/joomla/README.md
index 94ac0e8004..5fdebbadfc 100644
--- a/stable/joomla/README.md
+++ b/stable/joomla/README.md
@@ -109,6 +109,9 @@ The following table lists the configurable parameters of the Joomla! chart and t
 | `readinessProbe.timeoutSeconds`      | When the probe times out                                    | 5                                              |
 | `readinessProbe.failureThreshold`    | Minimum consecutive failures to be considered failed        | 6                                              |
 | `readinessProbe.successThreshold`    | Minimum consecutive successes to be considered successful   | 1                                              |
+| `nodeSelector`                       | Node labels for pod assignment                              | `{}`                                           |
+| `tolerations`                        | List of node taints to tolerate                             | `[]`                                           |
+| `affinity`                           | Map of node/pod affinities                                  | `{}`                                           |
 
 The above parameters map to the env variables defined in [bitnami/joomla](http://github.com/bitnami/bitnami-docker-joomla). For more information please refer to the [bitnami/joomla](http://github.com/bitnami/bitnami-docker-joomla) image documentation.
 
diff --git a/stable/joomla/templates/deployment.yaml b/stable/joomla/templates/deployment.yaml
index 5bed3a74cc..1032233c8e 100644
--- a/stable/joomla/templates/deployment.yaml
+++ b/stable/joomla/templates/deployment.yaml
@@ -144,4 +144,16 @@ spec:
       {{- else }}
         emptyDir: {}
       {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end -}}
+      {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/stable/joomla/values.yaml b/stable/joomla/values.yaml
index 155ef14162..bbb6a5dd96 100644
--- a/stable/joomla/values.yaml
+++ b/stable/joomla/values.yaml
@@ -42,7 +42,7 @@ allowEmptyPassword: "yes"
 ##
 externalDatabase:
   ## Database host
-  host:
+  host: localhost
 
   ## Database host
   port: 3306
@@ -51,7 +51,7 @@ externalDatabase:
   user: bn_joomla
 
   ## Database password
-  password:
+  password: ""
 
   ## Database name
   database: bitnami_joomla
@@ -89,7 +89,7 @@ mariadb:
   ## MariaDB admin password
   ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#setting-the-root-password-on-first-run
   ##
-  # root:
+  # rootUser:
   #   password:
 
   ## Enable persistence using Persistent Volume Claims
@@ -109,6 +109,23 @@ mariadb:
       accessMode: ReadWriteOnce
       size: 8Gi
 
+## Configure extra options for liveness and readiness probes
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
+livenessProbe:
+  enbaled: true
+  initialDelaySeconds: 120
+  periodSeconds: 10
+  timeoutSeconds: 5
+  failureThreshold: 6
+  successThreshold: 1
+readinessProbe:
+  enabled: true
+  initialDelaySeconds: 30
+  periodSeconds: 10
+  timeoutSeconds: 5
+  failureThreshold: 6
+  successThreshold: 1
+
 ## Kubernetes svc configuration
 ##
 service:
@@ -215,19 +232,17 @@ resources:
     memory: 512Mi
     cpu: 300m
 
-## Configure extra options for liveness and readiness probes
-## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
-livenessProbe:
-  enbaled: true
-  initialDelaySeconds: 120
-  periodSeconds: 10
-  timeoutSeconds: 5
-  failureThreshold: 6
-  successThreshold: 1
-readinessProbe:
-  enabled: true
-  initialDelaySeconds: 30
-  periodSeconds: 10
-  timeoutSeconds: 5
-  failureThreshold: 6
-  successThreshold: 1
+## Node labels for pod assignment
+## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+##
+nodeSelector: {}
+
+## Tolerations for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+##
+tolerations: []
+
+## Affinity for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+##
+affinity: {}