diff --git a/templates/coderd.yaml b/templates/coderd.yaml
index 5660e051..ff5623a4 100644
--- a/templates/coderd.yaml
+++ b/templates/coderd.yaml
@@ -3,6 +3,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
+    app.kubernetes.io/name: {{ include "coder.serviceName" . }}
+    app.kubernetes.io/part-of: coder
+    app: {{ include "coder.serviceName" . }}
     coder.deployment: {{ include "coder.serviceName" . }}
   name: {{ include "coder.serviceName" . }}
   namespace: {{ .Release.Namespace | quote }}
@@ -22,6 +25,9 @@ spec:
   template:
     metadata:
       labels:
+        app.kubernetes.io/name: {{ include "coder.serviceName" . }}
+        app.kubernetes.io/part-of: coder
+        app: {{ include "coder.serviceName" . }}
         coder.deployment: {{ include "coder.serviceName" . }}
       annotations:
       {{- range $key, $value := fromYaml (include "movedValue" (dict "Values" .Values "Key" "services.annotations")) }}
diff --git a/templates/timescale.yaml b/templates/timescale.yaml
index 95eb2a40..91353d32 100644
--- a/templates/timescale.yaml
+++ b/templates/timescale.yaml
@@ -7,6 +7,8 @@ metadata:
   name: timescale
   namespace: {{ .Release.Namespace }}
   labels:
+    app.kubernetes.io/name: timescale
+    app.kubernetes.io/part-of: coder
     app: timescale
     coder.deployment: timescale
 spec:
@@ -34,6 +36,8 @@ spec:
   template:
     metadata:
       labels:
+        app.kubernetes.io/name: timescale
+        app.kubernetes.io/part-of: coder
         app: timescale
         coder.deployment: timescale
       annotations: