diff --git a/magicleaps/helm-pkg/authentication/templates/authentication/deployment.yaml b/magicleaps/helm-pkg/authentication/templates/authentication/deployment.yaml
index 3cd1f4ed..11d9c438 100644
--- a/magicleaps/helm-pkg/authentication/templates/authentication/deployment.yaml
+++ b/magicleaps/helm-pkg/authentication/templates/authentication/deployment.yaml
@@ -10,7 +10,7 @@ metadata:
   annotations:
       opentelemetry.io/config-checksum: {{ include (print $.Template.BasePath "/authentication/opentelemetry.yaml") . | sha256sum }}
 {{- end }}
-  name: "magicleaps-authentication"
+  name: "{{ .Release.Name }}-authentication"
   namespace: {{ .Release.Namespace | quote }}
 spec:
   selector:
diff --git a/magicleaps/helm-pkg/authentication/values.prod.yaml b/magicleaps/helm-pkg/authentication/values.prod.yaml
index bcccd56b..e6778b33 100644
--- a/magicleaps/helm-pkg/authentication/values.prod.yaml
+++ b/magicleaps/helm-pkg/authentication/values.prod.yaml
@@ -62,7 +62,7 @@ authentication:
       enabled: false
   ingresses:
   - name: magicleaps-authentication-prod-ingress
-    host: authentication.magicleaps.mathmast.com
+    host: authentication.prod.magicleaps.mathmast.com
     class: nginx
     rules:
     - path: /
diff --git a/magicleaps/helm-pkg/authentication/values.yaml b/magicleaps/helm-pkg/authentication/values.yaml
index f63bc2c8..41090a45 100644
--- a/magicleaps/helm-pkg/authentication/values.yaml
+++ b/magicleaps/helm-pkg/authentication/values.yaml
@@ -62,7 +62,7 @@ authentication:
       enabled: false
   ingresses:
   - name: magicleaps-authentication-ingress
-    host: authentication.magicleaps.mathmast.com
+    host: authentication.default.magicleaps.mathmast.com
     class: nginx
     rules:
     - path: /