-{{- if .Values.ricxapp.fullnameOverride -}}
-{{- .Values.ricxapp.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.ricxapp.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Namespace $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
+ {{- $name := ( include "ricxapp.name" . ) -}}
+ {{- $fullname := ( printf "%s-%s" .Release.Namespace $name ) -}}
+ {{- default $fullname .Values.ricxapp.fullname | trunc 63 | trimSuffix "-" -}}