diff --git a/README.md b/README.md
index 28ef916b..e7b43719 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # authentik
 
-![Version: 1.0.0-RC4](https://img.shields.io/badge/Version-1.0.0--RC4-informational?style=flat-square) ![AppVersion: 2021.4.5](https://img.shields.io/badge/AppVersion-2021.4.5-informational?style=flat-square)
+![Version: 1.0.0-RC5](https://img.shields.io/badge/Version-1.0.0--RC5-informational?style=flat-square) ![AppVersion: 2021.4.5](https://img.shields.io/badge/AppVersion-2021.4.5-informational?style=flat-square)
 
 authentik is an open-source Identity Provider focused on flexibility and versatility
 
diff --git a/charts/authentik/Chart.yaml b/charts/authentik/Chart.yaml
index 172b0598..816c64ac 100644
--- a/charts/authentik/Chart.yaml
+++ b/charts/authentik/Chart.yaml
@@ -9,7 +9,7 @@ keywords:
   - proxy
   - oauth
   - authentication
-version: 1.0.0-RC4
+version: 1.0.0-RC5
 appVersion: 2021.4.5
 icon: https://raw.githubusercontent.com/BeryJu/authentik/master/web/icons/icon.svg
 maintainers:
@@ -35,10 +35,10 @@ annotations:
   artifacthub.io/prerelease: "true"
   artifacthub.io/changes: |
     - kind: fixed
-      description: envValueFrom indentation
+      description: removed lingering suffix in ingress causing a mismatch for selector
       links:
         - name: Github PR
-          url: https://github.com/goauthentik/helm/pull/4
+          url: https://github.com/goauthentik/helm/pull/5
   artifacthub.io/license: GPL-3.0-only
   artifacthub.io/links: |
     - name: Github
diff --git a/charts/authentik/README.md b/charts/authentik/README.md
index 28ef916b..e7b43719 100644
--- a/charts/authentik/README.md
+++ b/charts/authentik/README.md
@@ -1,6 +1,6 @@
 # authentik
 
-![Version: 1.0.0-RC4](https://img.shields.io/badge/Version-1.0.0--RC4-informational?style=flat-square) ![AppVersion: 2021.4.5](https://img.shields.io/badge/AppVersion-2021.4.5-informational?style=flat-square)
+![Version: 1.0.0-RC5](https://img.shields.io/badge/Version-1.0.0--RC5-informational?style=flat-square) ![AppVersion: 2021.4.5](https://img.shields.io/badge/AppVersion-2021.4.5-informational?style=flat-square)
 
 authentik is an open-source Identity Provider focused on flexibility and versatility
 
diff --git a/charts/authentik/templates/deployment.yaml b/charts/authentik/templates/deployment.yaml
index a2ac1b89..e09cf1ea 100644
--- a/charts/authentik/templates/deployment.yaml
+++ b/charts/authentik/templates/deployment.yaml
@@ -23,6 +23,7 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      enableServiceLinks: true
       containers:
         - name: {{ $.Chart.Name }}
           image: "{{ $.Values.image.name }}:{{ $.Values.image.tag }}"
diff --git a/charts/authentik/templates/ingress.yaml b/charts/authentik/templates/ingress.yaml
index bd7dc823..87fca27c 100644
--- a/charts/authentik/templates/ingress.yaml
+++ b/charts/authentik/templates/ingress.yaml
@@ -1,5 +1,4 @@
 {{- if .Values.ingress.enabled -}}
-  {{- $appSvcName := printf "%s-server" (include "common.names.fullname" .) -}}
   {{- $apiIsStable := include "authentik.ingress.isStable" . -}}
 apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }}
 kind: Ingress
@@ -32,11 +31,11 @@ spec:
             backend:
               {{- if $apiIsStable }}
               service:
-                name: {{ $appSvcName }}
+                name: {{ include "common.names.fullname" $ }}
                 port:
                   name: http
               {{- else }}
-              serviceName: {{ $appSvcName }}
+              serviceName: {{ include "common.names.fullname" $ }}
               servicePort: 9000
               {{- end }}
           {{- end }}