diff --git a/k8s/helm/tngkds/templates/deployment.yaml b/k8s/helm/tngkds/templates/deployment.yaml
index 9ffd69f..67698b1 100644
--- a/k8s/helm/tngkds/templates/deployment.yaml
+++ b/k8s/helm/tngkds/templates/deployment.yaml
@@ -1,9 +1,9 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "tngkds-backend.fullname" . }}
+  name: {{ include "tngkds.fullname" . }}
   labels:
-    {{- include "tngkds-backend.labels" . | nindent 4 }}
+    {{- include "tngkds.labels" . | nindent 4 }}
   namespace: {{ .Release.Namespace }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
@@ -11,7 +11,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "tngkds-backend.selectorLabels" . | nindent 6 }}
+      {{- include "tngkds.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -19,7 +19,7 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
       labels:
-        {{- include "tngkds-backend.labels" . | nindent 8 }}
+        {{- include "tngkds.labels" . | nindent 8 }}
     spec:
       imagePullSecrets:
         - name: {{ .Values.imagePullSecrets }}
diff --git a/k8s/helm/tngkds/templates/did-signer-secret.yaml b/k8s/helm/tngkds/templates/did-signer-secret.yaml
index a1918d9..2807116 100644
--- a/k8s/helm/tngkds/templates/did-signer-secret.yaml
+++ b/k8s/helm/tngkds/templates/did-signer-secret.yaml
@@ -4,5 +4,5 @@ metadata:
   name: did-signer-secret
   namespace: {{ .Release.Namespace }}
 data:
-	did-signer.p12: {{ .Values.secrets.didSigner }}
+  did-signer.p12: {{ .Values.secrets.didSigner }}
 type: Opaque
diff --git a/k8s/helm/tngkds/templates/mtls-secret.yaml b/k8s/helm/tngkds/templates/mtls-secret.yaml
index 44fa91f..edd35cd 100644
--- a/k8s/helm/tngkds/templates/mtls-secret.yaml
+++ b/k8s/helm/tngkds/templates/mtls-secret.yaml
@@ -4,7 +4,7 @@ metadata:
   name: mtls-secret
   namespace: {{ .Release.Namespace }}
 data:
-	tls_key_store.p12: {{ .Values.secrets.mtls.tlsKeyStore }}
+  tls_key_store.p12: {{ .Values.secrets.mtls.tlsKeyStore }}
   tng_tls_server_truststore.p12: {{ .Values.secrets.mtls.tlsServerTrustStore }}
-	trustanchor_store.jks: {{ .Values.secrets.mtls.tlsTrustAnchorStore }}
-type: Opaque
\ No newline at end of file
+  trustanchor_store.jks: {{ .Values.secrets.mtls.tlsTrustAnchorStore }}
+type: Opaque
diff --git a/k8s/helm/tngkds/templates/service.yaml b/k8s/helm/tngkds/templates/service.yaml
index b4b1359..ebf38df 100644
--- a/k8s/helm/tngkds/templates/service.yaml
+++ b/k8s/helm/tngkds/templates/service.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "tngkds-backend.fullname" . }}-service
+  name: {{ include "tngkds.fullname" . }}-service
   labels:
-    {{- include "tngkds-backend.labels" . | nindent 4 }}
+    {{- include "tngkds.labels" . | nindent 4 }}
   namespace: {{ .Release.Namespace }}
 spec:
   type: {{ .Values.service.type }}
@@ -16,4 +16,4 @@ spec:
       name: {{ .name }}
   {{ end }}
   selector:
-    {{- include "tngkds-backend.selectorLabels" . | nindent 4 }}
+    {{- include "tngkds.selectorLabels" . | nindent 4 }}
diff --git a/k8s/helm/tngkds/templates/tng-distribution-pull-secret.yaml b/k8s/helm/tngkds/templates/tng-distribution-pull-secret.yaml
index a0e8869..e984041 100644
--- a/k8s/helm/tngkds/templates/tng-distribution-pull-secret.yaml
+++ b/k8s/helm/tngkds/templates/tng-distribution-pull-secret.yaml
@@ -4,5 +4,5 @@ metadata:
   name: tng-distribution-pull-secret
   namespace: {{ .Release.Namespace }}
 data:
-	.dockerconfigjson: {{ .Values.secrets.dockerPull }}
-type: kubernetes.io/dockerconfigjson
\ No newline at end of file
+  .dockerconfigjson: {{ .Values.secrets.dockerPull }}
+type: kubernetes.io/dockerconfigjson
diff --git a/k8s/helm/tngkds/templates/truststore-secret.yaml b/k8s/helm/tngkds/templates/truststore-secret.yaml
index a9ce58d..ac4e6ac 100644
--- a/k8s/helm/tngkds/templates/truststore-secret.yaml
+++ b/k8s/helm/tngkds/templates/truststore-secret.yaml
@@ -4,5 +4,5 @@ metadata:
   name: truststore-secret
   namespace: {{ .Release.Namespace }}
 data:
-	tls_trust_store.jks: {{ .Values.secrets.trustStore }}
-type: Opaque
\ No newline at end of file
+  tls_trust_store.jks: {{ .Values.secrets.trustStore }}
+type: Opaque
diff --git a/k8s/helm/tngkds/values-local.yaml b/k8s/helm/tngkds/values-local.yaml
index 0cb254b..3b2fbf3 100644
--- a/k8s/helm/tngkds/values-local.yaml
+++ b/k8s/helm/tngkds/values-local.yaml
@@ -1,4 +1,4 @@
-# Default values for tngkds-backend.
+# Default values for tngkds.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
@@ -117,4 +117,4 @@ secrets: # Below are all b64 encoded
   mtls:
     tlsKeyStore: <tls trust store>
     tlsServerTrustStore: <tls server trust store>
-    tlsTrustAnchorStore: <tls trustanchor store>
\ No newline at end of file
+    tlsTrustAnchorStore: <tls trustanchor store>
diff --git a/k8s/helm/tngkds/values.yaml b/k8s/helm/tngkds/values.yaml
index 4dc70ef..f8636e3 100644
--- a/k8s/helm/tngkds/values.yaml
+++ b/k8s/helm/tngkds/values.yaml
@@ -1,4 +1,4 @@
-# Default values for tngkds-backend.
+# Default values for tngkds.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
@@ -18,11 +18,6 @@ imagePullSecrets: tng-distribution-pull-secret
 nameOverride: ""
 fullnameOverride: ""
 
-# Liquibase
-liquibaseImage:
-  repository: ghcr.io/worldhealthorganization/tng-key-distribution/tng-key-distribution-initcontainer
-  tag: <liquibase-image-tag>
-
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
@@ -174,6 +169,7 @@ did:
     EU: XEU
   group-deny-list:
     - UPLOAD
+    - AUTHENTICATION
   group-name-mapping:
     CSCA: SCA