diff --git a/conduit/Chart.yaml b/conduit/Chart.yaml
index fa20f58..f2151b0 100644
--- a/conduit/Chart.yaml
+++ b/conduit/Chart.yaml
@@ -3,7 +3,7 @@ name: conduit
 description: Conduit is a simple, fast and reliable chat server powered by Matrix.
 icon: https://conduit.rs/conduit.svg
 type: application
-version: 0.2.4
+version: 0.2.5
 # renovate: image=registry.gitlab.com/famedly/conduit/matrix-conduit
 appVersion: "0.6.0"
 maintainers:
diff --git a/conduit/README.adoc b/conduit/README.adoc
index a3f5293..1b5aa50 100644
--- a/conduit/README.adoc
+++ b/conduit/README.adoc
@@ -2,7 +2,7 @@
 
 = conduit
 
-image::https://img.shields.io/badge/Version-0.2.4-informational?style=flat-square[Version: 0.2.4]
+image::https://img.shields.io/badge/Version-0.2.5-informational?style=flat-square[Version: 0.2.5]
 image::https://img.shields.io/badge/Version-application-informational?style=flat-square[Type: application]
 image::https://img.shields.io/badge/AppVersion-0.6.0-informational?style=flat-square[AppVersion: 0.6.0]
 == Maintainers
diff --git a/conduit/templates/wellknown/deployment.yaml b/conduit/templates/wellknown/deployment.yaml
index 7f4a54d..7db751b 100644
--- a/conduit/templates/wellknown/deployment.yaml
+++ b/conduit/templates/wellknown/deployment.yaml
@@ -5,14 +5,13 @@ metadata:
   name: {{ include "conduit.fullname" . }}-wellknown
   labels:
     {{- include "conduit.labels" . | nindent 4 }}
+    app.kubernetes.io/component: wellknown
 spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
+  replicas: {{ .Values.wellknown.replicaCount }}
   selector:
     matchLabels:
       {{- include "conduit.selectorLabels" . | nindent 6 }}
-      type: wellknown
+      app.kubernetes.io/component: wellknown
   template:
     metadata:
       {{- with .Values.wellknown.podAnnotations }}
@@ -21,10 +20,10 @@ spec:
       {{- end }}
       labels:
         {{- include "conduit.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: wellknown
         {{- with .Values.wellknown.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-        type: wellknown
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -52,7 +51,7 @@ spec:
               path: /
               port: http
           resources:
-            {{- toYaml .Values.resources | nindent 12 }}
+            {{- toYaml .Values.wellknown.resources | nindent 12 }}
           volumeMounts:
             - name: "data"
               mountPath: "/usr/share/nginx/html/.well-known/matrix/"
@@ -72,4 +71,4 @@ spec:
         - name: "data"
           configMap:
             name: {{ include "conduit.fullname" . }}-wellknown
-{{- end }}
\ No newline at end of file
+{{- end }}