diff --git a/helm-chart/renku/templates/crac/deployment.yaml b/helm-chart/renku/templates/crac/deployment.yaml
index 83fb75b96..69330dc92 100644
--- a/helm-chart/renku/templates/crac/deployment.yaml
+++ b/helm-chart/renku/templates/crac/deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: {{ template "renku.fullname" . }}-crac
   labels:
-    app: {{ template "renku.fullname" . }}-crac
+    app: renku-crac
     chart: {{ template "renku.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -15,12 +15,12 @@ spec:
     {{- toYaml .Values.crac.updateStrategy | nindent 4 }}
   selector:
     matchLabels:
-      app: {{ template "renku.name" . }}-crac
+      app: renku-crac
       release: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ template "renku.name" . }}-crac
+        app: renku-crac
         release: {{ .Release.Name }}
       {{- with .Values.crac.podAnnotations }}
       annotations:
diff --git a/helm-chart/renku/templates/crac/hpa.yaml b/helm-chart/renku/templates/crac/hpa.yaml
index ea3d561a5..54281c5c4 100644
--- a/helm-chart/renku/templates/crac/hpa.yaml
+++ b/helm-chart/renku/templates/crac/hpa.yaml
@@ -8,7 +8,7 @@ kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "renku.fullname" . }}-crac
   labels:
-    app: {{ template "renku.name" . }}-crac
+    app: renku-crac
     chart: {{ template "renku.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
diff --git a/helm-chart/renku/templates/crac/pdb.yaml b/helm-chart/renku/templates/crac/pdb.yaml
index b85839e77..fa0a84a94 100644
--- a/helm-chart/renku/templates/crac/pdb.yaml
+++ b/helm-chart/renku/templates/crac/pdb.yaml
@@ -4,7 +4,7 @@ kind: PodDisruptionBudget
 metadata:
   name: {{ template "renku.fullname" . }}-crac
   labels:
-    app: {{ template "renku.name" . }}-crac
+    app: renku-crac
     chart: {{ template "renku.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -12,6 +12,6 @@ spec:
   maxUnavailable: 50%
   selector:
     matchLabels:
-      app: {{ template "renku.name" . }}-crac
+      app: renku-crac
       release: {{ .Release.Name }}
 {{- end }}
diff --git a/helm-chart/renku/templates/crac/service.yaml b/helm-chart/renku/templates/crac/service.yaml
index 8af837fca..96adba255 100644
--- a/helm-chart/renku/templates/crac/service.yaml
+++ b/helm-chart/renku/templates/crac/service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: {{ template "renku.name" . }}-crac
   labels:
-    app: {{ template "renku.name" . }}-crac
+    app: renku-crac
     chart: {{ template "renku.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
diff --git a/helm-chart/renku/templates/network-policies.yaml b/helm-chart/renku/templates/network-policies.yaml
index 6c7b5ca87..170cb0bcc 100644
--- a/helm-chart/renku/templates/network-policies.yaml
+++ b/helm-chart/renku/templates/network-policies.yaml
@@ -57,6 +57,12 @@ spec:
           namespaceSelector:
             matchLabels:
               kubernetes.io/metadata.name: {{ .Release.Namespace }}
+        - podSelector:
+            matchLabels:
+              app: renku-crac
+          namespaceSelector:
+            matchLabels:
+              kubernetes.io/metadata.name: {{ .Release.Namespace }}
       ports:
         - protocol: TCP
           port: 5432
diff --git a/helm-chart/renku/templates/secrets.yaml b/helm-chart/renku/templates/secrets.yaml
index 513d9fec0..88e846b24 100644
--- a/helm-chart/renku/templates/secrets.yaml
+++ b/helm-chart/renku/templates/secrets.yaml
@@ -37,7 +37,7 @@ type: Opaque
 data:
   {{ .Values.redis.auth.existingSecretPasswordKey }}: {{ .Values.redis.password | b64enc | quote }}
 {{- end }}
-
+---
 apiVersion: v1
 kind: Secret
 metadata: