diff --git a/charts/mssqlserver-2019/Chart.yaml b/charts/mssqlserver-2019/Chart.yaml
index f30cf96..01916c7 100644
--- a/charts/mssqlserver-2019/Chart.yaml
+++ b/charts/mssqlserver-2019/Chart.yaml
@@ -9,4 +9,4 @@ maintainers:
 name: mssqlserver-2019
 sources:
 - https://hub.docker.com/_/microsoft-mssql-server
-version: "1.2.2"
+version: "1.2.3"
diff --git a/charts/mssqlserver-2019/templates/NOTES.txt b/charts/mssqlserver-2019/templates/NOTES.txt
index 58817f6..5cc4311 100644
--- a/charts/mssqlserver-2019/templates/NOTES.txt
+++ b/charts/mssqlserver-2019/templates/NOTES.txt
@@ -6,7 +6,7 @@ License Terms: https://go.microsoft.com/fwlink/?linkid=857698
 Docker Hub Resource: https://hub.docker.com/_/microsoft-mssql-server
 
 Edition for this installation: {{ .Values.edition.value }}
-SQL Server Name: {{ template "mssql.name" . }}.{{ .Release.Namespace }}
+SQL Server Name: {{ template "mssql.fullname" . }}.{{ .Release.Namespace }}
 Port: {{ .Values.service.port }}
 Collation: {{ .Values.collation }}
 
@@ -18,7 +18,7 @@ $ printf $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "
 2. You can test that SQL Server is available by the service port with with the following set of command:
 (Note: You will be prompted for the SA password, use the password generated in Step 1)
 $ kubectl run mssqlcli --image=mcr.microsoft.com/mssql-tools -ti --restart=Never --rm=true -- /bin/bash
-$ sqlcmd -S {{ template "mssql.name" . }}.{{ .Release.Namespace }},{{ .Values.service.port }} -U sa 
+$ sqlcmd -S {{ template "mssql.fullname" . }}.{{ .Release.Namespace }},{{ .Values.service.port }} -U sa 
 $ Password: <Enter Password for SA>
 
 2.  Connection Library Information
diff --git a/charts/mssqlserver-2019/templates/_helpers.tpl b/charts/mssqlserver-2019/templates/_helpers.tpl
index d72a4cd..c1f971c 100644
--- a/charts/mssqlserver-2019/templates/_helpers.tpl
+++ b/charts/mssqlserver-2019/templates/_helpers.tpl
@@ -2,10 +2,6 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "mssql.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- 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).
diff --git a/charts/mssqlserver-2019/templates/deployment.yaml b/charts/mssqlserver-2019/templates/deployment.yaml
index 8fd88aa..2907b6d 100644
--- a/charts/mssqlserver-2019/templates/deployment.yaml
+++ b/charts/mssqlserver-2019/templates/deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: {{ template "mssql.fullname" . }}
   labels:
-    app: {{ template "mssql.name" . }}
+    app: {{ template "mssql.fullname" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -18,12 +18,12 @@ spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ template "mssql.name" . }}
+      app: {{ template "mssql.fullname" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ template "mssql.name" . }}
+        app: {{ template "mssql.fullname" . }}
         release: {{ .Release.Name }}
 {{- if .Values.pod.labels }}
 {{ toYaml .Values.pod.labels | indent 8 }}
diff --git a/charts/mssqlserver-2019/templates/secret.yaml b/charts/mssqlserver-2019/templates/secret.yaml
index af5212e..acf16e5 100644
--- a/charts/mssqlserver-2019/templates/secret.yaml
+++ b/charts/mssqlserver-2019/templates/secret.yaml
@@ -3,7 +3,7 @@ kind: Secret
 metadata:
   name: {{ template "mssql.fullname" . }}-secret
   labels:
-    app: {{ template "mssql.name" . }}
+    app: {{ template "mssql.fullname" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
diff --git a/charts/mssqlserver-2019/templates/service.yaml b/charts/mssqlserver-2019/templates/service.yaml
index d3948a5..d86d64d 100644
--- a/charts/mssqlserver-2019/templates/service.yaml
+++ b/charts/mssqlserver-2019/templates/service.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "mssql.name" . }}
+  name: {{ template "mssql.fullname" . }}
   labels:
-    app: {{ template "mssql.name" . }}
+    app: {{ template "mssql.fullname" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -30,5 +30,5 @@ spec:
     targetPort: mssql
     protocol: TCP
   selector:
-    app: {{ template "mssql.name" . }}
+    app: {{ template "mssql.fullname" . }}
     release: {{ .Release.Name }}
diff --git a/charts/mssqlserver-2022/Chart.yaml b/charts/mssqlserver-2022/Chart.yaml
index 7d5cd32..2280656 100644
--- a/charts/mssqlserver-2022/Chart.yaml
+++ b/charts/mssqlserver-2022/Chart.yaml
@@ -9,4 +9,4 @@ maintainers:
 name: mssqlserver-2022
 sources:
 - https://hub.docker.com/_/microsoft-mssql-server
-version: "1.2.2"
+version: "1.2.3"
diff --git a/charts/mssqlserver-2022/templates/NOTES.txt b/charts/mssqlserver-2022/templates/NOTES.txt
index 58817f6..5cc4311 100644
--- a/charts/mssqlserver-2022/templates/NOTES.txt
+++ b/charts/mssqlserver-2022/templates/NOTES.txt
@@ -6,7 +6,7 @@ License Terms: https://go.microsoft.com/fwlink/?linkid=857698
 Docker Hub Resource: https://hub.docker.com/_/microsoft-mssql-server
 
 Edition for this installation: {{ .Values.edition.value }}
-SQL Server Name: {{ template "mssql.name" . }}.{{ .Release.Namespace }}
+SQL Server Name: {{ template "mssql.fullname" . }}.{{ .Release.Namespace }}
 Port: {{ .Values.service.port }}
 Collation: {{ .Values.collation }}
 
@@ -18,7 +18,7 @@ $ printf $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "
 2. You can test that SQL Server is available by the service port with with the following set of command:
 (Note: You will be prompted for the SA password, use the password generated in Step 1)
 $ kubectl run mssqlcli --image=mcr.microsoft.com/mssql-tools -ti --restart=Never --rm=true -- /bin/bash
-$ sqlcmd -S {{ template "mssql.name" . }}.{{ .Release.Namespace }},{{ .Values.service.port }} -U sa 
+$ sqlcmd -S {{ template "mssql.fullname" . }}.{{ .Release.Namespace }},{{ .Values.service.port }} -U sa 
 $ Password: <Enter Password for SA>
 
 2.  Connection Library Information
diff --git a/charts/mssqlserver-2022/templates/_helpers.tpl b/charts/mssqlserver-2022/templates/_helpers.tpl
index d72a4cd..c1f971c 100644
--- a/charts/mssqlserver-2022/templates/_helpers.tpl
+++ b/charts/mssqlserver-2022/templates/_helpers.tpl
@@ -2,10 +2,6 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "mssql.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- 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).
diff --git a/charts/mssqlserver-2022/templates/deployment.yaml b/charts/mssqlserver-2022/templates/deployment.yaml
index 8fd88aa..2907b6d 100644
--- a/charts/mssqlserver-2022/templates/deployment.yaml
+++ b/charts/mssqlserver-2022/templates/deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: {{ template "mssql.fullname" . }}
   labels:
-    app: {{ template "mssql.name" . }}
+    app: {{ template "mssql.fullname" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -18,12 +18,12 @@ spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ template "mssql.name" . }}
+      app: {{ template "mssql.fullname" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ template "mssql.name" . }}
+        app: {{ template "mssql.fullname" . }}
         release: {{ .Release.Name }}
 {{- if .Values.pod.labels }}
 {{ toYaml .Values.pod.labels | indent 8 }}
diff --git a/charts/mssqlserver-2022/templates/secret.yaml b/charts/mssqlserver-2022/templates/secret.yaml
index af5212e..acf16e5 100644
--- a/charts/mssqlserver-2022/templates/secret.yaml
+++ b/charts/mssqlserver-2022/templates/secret.yaml
@@ -3,7 +3,7 @@ kind: Secret
 metadata:
   name: {{ template "mssql.fullname" . }}-secret
   labels:
-    app: {{ template "mssql.name" . }}
+    app: {{ template "mssql.fullname" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
diff --git a/charts/mssqlserver-2022/templates/service.yaml b/charts/mssqlserver-2022/templates/service.yaml
index d3948a5..d86d64d 100644
--- a/charts/mssqlserver-2022/templates/service.yaml
+++ b/charts/mssqlserver-2022/templates/service.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "mssql.name" . }}
+  name: {{ template "mssql.fullname" . }}
   labels:
-    app: {{ template "mssql.name" . }}
+    app: {{ template "mssql.fullname" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -30,5 +30,5 @@ spec:
     targetPort: mssql
     protocol: TCP
   selector:
-    app: {{ template "mssql.name" . }}
+    app: {{ template "mssql.fullname" . }}
     release: {{ .Release.Name }}