diff --git a/charts/apps/piped/templates/common.yaml b/charts/apps/piped/templates/common.yaml
index 4c771e4..7c8f010 100644
--- a/charts/apps/piped/templates/common.yaml
+++ b/charts/apps/piped/templates/common.yaml
@@ -8,6 +8,19 @@
 {{- end -}}
 {{- end -}}
 
+{{- define "common.names.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 -}}
+
 {{- define "app-template.hardcodedValues" -}}
 
 # Set the nameOverride based on the release name if no override has been set