diff --git a/stable/moodle/Chart.yaml b/stable/moodle/Chart.yaml
index 04dd1f5ff3..3025ce77e1 100644
--- a/stable/moodle/Chart.yaml
+++ b/stable/moodle/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: moodle
-version: 4.2.9
+version: 4.2.10
 appVersion: 3.7.1
 description: Moodle is a learning platform designed to provide educators, administrators and learners with a single robust, secure and integrated system to create personalised learning environments
 keywords:
diff --git a/stable/moodle/README.md b/stable/moodle/README.md
index c3596bff02..4056bc7dab 100644
--- a/stable/moodle/README.md
+++ b/stable/moodle/README.md
@@ -56,8 +56,6 @@ The following table lists the configurable parameters of the Moodle chart and th
 | `image.tag`                           | Moodle Image tag                                                                             | `{TAG_NAME}`                                  |
 | `image.pullPolicy`                    | Image pull policy                                                                            | `IfNotPresent`                                |
 | `image.pullSecrets`                   | Specify docker-registry secret names as an array                                             | `[]` (does not add image pull secrets to deployed pods) |
-| `nameOverride`                        | String to partially override moodle.fullname template with a string (will prepend the release name) | `nil`                                   |
-| `fullnameOverride`                    | String to fully override moodle.fullname template with a string                              | `nil`                                          |
 | `moodleUsername`                      | User of the application                                                                      | `user`                                         |
 | `moodlePassword`                      | Application password                                                                         | _random 10 character alphanumeric string_      |
 | `moodleEmail`                         | Admin email                                                                                  | `user@example.com`                             |
diff --git a/stable/moodle/templates/_helpers.tpl b/stable/moodle/templates/_helpers.tpl
index 6f7c22e054..ae6ee9a05d 100644
--- a/stable/moodle/templates/_helpers.tpl
+++ b/stable/moodle/templates/_helpers.tpl
@@ -11,33 +11,24 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "moodle.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
-{{- end -}}
-{{- end -}}
 
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "moodle.mariadb.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- printf "%s-%s" .Values.fullnameOverride "mariadb" | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
 {{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s-%s" .Release.Name $name "mariadb" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
 {{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "moodle.moodle.fullname" -}}
+{{- printf "%s-%s" .Release.Name "moodle" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
diff --git a/stable/moodle/templates/deployment.yaml b/stable/moodle/templates/deployment.yaml
index 18df17325d..b8b3a1559b 100644
--- a/stable/moodle/templates/deployment.yaml
+++ b/stable/moodle/templates/deployment.yaml
@@ -154,7 +154,7 @@ spec:
       - name: moodle-data
       {{- if .Values.persistence.enabled }}
         persistentVolumeClaim:
-          claimName: {{ .Values.persistence.existingClaim | default (include "moodle.fullname" . ) }}
+          claimName: {{ .Values.persistence.existingClaim | default (include "moodle.moodle.fullname" . ) }}
       {{- else }}
         emptyDir: {}
       {{- end }}
diff --git a/stable/moodle/values.yaml b/stable/moodle/values.yaml
index f4b27143a7..f02189e424 100644
--- a/stable/moodle/values.yaml
+++ b/stable/moodle/values.yaml
@@ -26,14 +26,6 @@ image:
   # pullSecrets:
   #   - myRegistryKeySecretName
 
-## String to partially override moodle.fullname template (will maintain the release name)
-##
-# nameOverride:
-
-## String to fully override moodle.fullname template
-##
-# fullnameOverride:
-
 ## User of the application
 ## ref: https://github.com/bitnami/bitnami-docker-moodle#configuration
 ##