diff --git a/apps/etherpadlite-ssl/templates/deployment.yaml b/apps/etherpadlite-ssl/templates/deployment.yaml
index 3df7296..2ce7154 100644
--- a/apps/etherpadlite-ssl/templates/deployment.yaml
+++ b/apps/etherpadlite-ssl/templates/deployment.yaml
@@ -6,13 +6,13 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: etherpad
+      app: {{ .Release.Name }}-etherpad
   replicas: 1
   template:
     metadata:
       labels:
-        app: {{ .Release.Name }}
-        use-as-service: "yes"
+        app: {{ .Release.Name }}-etherpad
+        use-as-service: {{ .Release.Name }}
     spec:
       initContainers:
         - name: wait-for-cert
@@ -61,8 +61,7 @@ spec:
      targetPort: 9001
      name: https
   selector:
-   app: {{ .Release.Name }}
-   use-as-service: "yes"
+   use-as-service: {{ .Release.Name }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -103,8 +102,8 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ .Release.Name }}
-        use-as-service: "yes"
+        app: certbot-letsencrypt-getcert
+        use-as-service: {{ .Release.Name }}
     spec:
       restartPolicy: Never
       containers: