diff --git a/magicleaps/helm-pkg/authentication/templates/authentication/authentication-config.yaml b/magicleaps/helm-pkg/authentication/templates/authentication/authentication-config.yaml
index 246cd018..b38219be 100644
--- a/magicleaps/helm-pkg/authentication/templates/authentication/authentication-config.yaml
+++ b/magicleaps/helm-pkg/authentication/templates/authentication/authentication-config.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: magicleaps-authentication-config
+  name: {{ .Release.Name }}-authentication-config
   namespace: {{ .Release.Namespace }}
 type: Opaque
 data:
diff --git a/magicleaps/helm-pkg/authentication/values.alpha.yaml b/magicleaps/helm-pkg/authentication/values.alpha.yaml
index ec679a5e..c453960a 100644
--- a/magicleaps/helm-pkg/authentication/values.alpha.yaml
+++ b/magicleaps/helm-pkg/authentication/values.alpha.yaml
@@ -54,14 +54,14 @@ authentication:
         failureThreshold: 3
         terminationGracePeriodSeconds: 30
   services:
-  - name: magicleaps-authentication-service
+  - name: magicleaps-authentication-alpha-service
     type: ClusterIP
     port: 8015
     targetPort: 8015
     serviceMonitor:
       enabled: false
   ingresses:
-  - name: magicleaps-authentication-ingress
+  - name: magicleaps-authentication-alpha-ingress
     host: authentication.alpha.magicleaps.mathmast.com
     class: nginx
     rules:
@@ -69,7 +69,7 @@ authentication:
       pathType: Prefix
       backend:
         service:
-          name: magicleaps-authentication-service
+          name: magicleaps-authentication-alpha-service
           port:
             number: 8015
     tls:
diff --git a/magicleaps/helm-pkg/authentication/values.prod.yaml b/magicleaps/helm-pkg/authentication/values.prod.yaml
index 9eb869f7..bcccd56b 100644
--- a/magicleaps/helm-pkg/authentication/values.prod.yaml
+++ b/magicleaps/helm-pkg/authentication/values.prod.yaml
@@ -54,14 +54,14 @@ authentication:
         failureThreshold: 3
         terminationGracePeriodSeconds: 30
   services:
-  - name: magicleaps-authentication-service
+  - name: magicleaps-authentication-prod-service
     type: ClusterIP
     port: 8015
     targetPort: 8015
     serviceMonitor:
       enabled: false
   ingresses:
-  - name: magicleaps-authentication-ingress
+  - name: magicleaps-authentication-prod-ingress
     host: authentication.magicleaps.mathmast.com
     class: nginx
     rules:
@@ -69,7 +69,7 @@ authentication:
       pathType: Prefix
       backend:
         service:
-          name: magicleaps-authentication-service
+          name: magicleaps-authentication-prod-service
           port:
             number: 8015
     tls:
@@ -77,7 +77,7 @@ authentication:
       issuerRef:
         name: mathmast-dot-com
         kind: ClusterIssuer
-      name: magicleaps-authentication-ingress-tls
+      name: magicleaps-authentication-prod-ingress-tls
   configs:
     tz: America/Settle
     appName: magicleaps-authentication