diff --git a/charts/wordpress-helm/templates/_helpers.tpl b/charts/wordpress-helm/templates/_helpers.tpl
index ec6098a..0fbdcbb 100644
--- a/charts/wordpress-helm/templates/_helpers.tpl
+++ b/charts/wordpress-helm/templates/_helpers.tpl
@@ -5,10 +5,6 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
-{{- define "wordpress-website.fullname" -}}
-{{- default .Values.fullname }}
-{{- end }}
-
 {{/*
 Create chart name and version as used by the chart label.
 */}}
@@ -41,7 +37,7 @@ Create the name of the service account to use
 */}}
 {{- define "wordpress-website.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "wordpress-website.fullname" .) .Values.serviceAccount.name }}
+{{- default .Values.fullname .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
diff --git a/charts/wordpress-helm/templates/deployment.yaml b/charts/wordpress-helm/templates/deployment.yaml
index 71c1b5e..d6ad1f7 100644
--- a/charts/wordpress-helm/templates/deployment.yaml
+++ b/charts/wordpress-helm/templates/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "wordpress-website.fullname" . }}
+  name: {{ .Values.fullname }}
   labels:
     {{- include "wordpress-website.labels" . | nindent 4 }}
 spec:
@@ -47,7 +47,7 @@ spec:
             - name: WORDPRESS_DB_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "wordpress-website.fullname" . }}-postgresql
+                  name: {{ .Values.fullname }}-postgresql
                   key: postgresql-password
             - name: WORDPRESS_TABLE_PREFIX
               value: {{ .Values.wordpress.tablePrefix }}
@@ -103,7 +103,7 @@ spec:
       volumes:
         - name: wordpress-data
           persistentVolumeClaim:
-            claimName: {{ include "wordpress-website.fullname" . }}-data
+            claimName: {{ .Values.fullname }}-data
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/wordpress-helm/templates/ingress.yaml b/charts/wordpress-helm/templates/ingress.yaml
index d1d1d03..5db60a4 100644
--- a/charts/wordpress-helm/templates/ingress.yaml
+++ b/charts/wordpress-helm/templates/ingress.yaml
@@ -2,7 +2,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ include "wordpress-website.fullname" . }}
+  name: {{ .Values.fullname }}
   labels:
     {{- include "wordpress-website.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
@@ -33,7 +33,7 @@ spec:
             pathType: {{ .pathType }}
             backend:
               service:
-                name: {{ include "wordpress-website.fullname" . }}
+                name: {{ .Values.fullname }}
                 port:
                   number: {{ .Values.service.port }}
           {{- end }}
diff --git a/charts/wordpress-helm/templates/postgresql-statefulset.yaml b/charts/wordpress-helm/templates/postgresql-statefulset.yaml
index 8b29cd5..b413a9d 100644
--- a/charts/wordpress-helm/templates/postgresql-statefulset.yaml
+++ b/charts/wordpress-helm/templates/postgresql-statefulset.yaml
@@ -1,12 +1,12 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ include "wordpress-website.fullname" . }}-postgresql
+  name: {{ .Values.fullname }}-postgresql
   labels:
     {{- include "wordpress-website.labels" . | nindent 4 }}
     app.kubernetes.io/component: database
 spec:
-  serviceName: {{ include "wordpress-website.fullname" . }}-postgresql
+  serviceName: {{ .Values.fullname }}-postgresql
   replicas: 1
   selector:
     matchLabels:
@@ -36,7 +36,7 @@ spec:
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "wordpress-website.fullname" . }}-postgresql
+                  name: {{ .Values.fullname }}-postgresql
                   key: postgresql-password
             - name: PGDATA
               value: /var/lib/postgresql/data/pgdata
@@ -74,12 +74,12 @@ spec:
       volumes:
         - name: postgresql-data
           persistentVolumeClaim:
-            claimName: {{ include "wordpress-website.fullname" . }}-postgresql-data
+            claimName: {{ .Values.fullname }}-postgresql-data
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "wordpress-website.fullname" . }}-postgresql
+  name: {{ .Values.fullname }}-postgresql
   labels:
     {{- include "wordpress-website.labels" . | nindent 4 }}
     app.kubernetes.io/component: database
diff --git a/charts/wordpress-helm/templates/pvc.yaml b/charts/wordpress-helm/templates/pvc.yaml
index 66a3fee..66f5cdd 100644
--- a/charts/wordpress-helm/templates/pvc.yaml
+++ b/charts/wordpress-helm/templates/pvc.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "wordpress-website.fullname" . }}-data
+  name: {{ .Values.fullname }}-data
   labels:
     {{- include "wordpress-website.labels" . | nindent 4 }}
     app.kubernetes.io/component: storage
@@ -20,7 +20,7 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "wordpress-website.fullname" . }}-postgresql-data
+  name: {{ .Values.fullname }}-postgresql-data
   labels:
     {{- include "wordpress-website.labels" . | nindent 4 }}
     app.kubernetes.io/component: database-storage
diff --git a/charts/wordpress-helm/templates/secret.yaml b/charts/wordpress-helm/templates/secret.yaml
index 1a6455e..cd3307e 100644
--- a/charts/wordpress-helm/templates/secret.yaml
+++ b/charts/wordpress-helm/templates/secret.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "wordpress-website.fullname" . }}-postgresql
+  name: {{ .Values.fullname }}-postgresql
   labels:
     {{- include "wordpress-website.labels" . | nindent 4 }}
 type: Opaque
diff --git a/charts/wordpress-helm/templates/service.yaml b/charts/wordpress-helm/templates/service.yaml
index 1dbb67c..49c2cf3 100644
--- a/charts/wordpress-helm/templates/service.yaml
+++ b/charts/wordpress-helm/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "wordpress-website.fullname" . }}
+  name: {{ .Values.fullname }}
   labels:
     {{- include "wordpress-website.labels" . | nindent 4 }}
 spec: