diff --git a/charts/tooljet/templates/_helpers.tpl b/charts/tooljet/templates/_helpers.tpl
index cbae9f4..628bea7 100644
--- a/charts/tooljet/templates/_helpers.tpl
+++ b/charts/tooljet/templates/_helpers.tpl
@@ -50,6 +50,27 @@ app.kubernetes.io/name: {{ include "tooljet.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{/*
+Postgrest labels
+*/}}
+{{- define "tooljet-postgrest.labels" -}}
+helm.sh/chart: {{ include "tooljet.chart" . }}
+{{ include "tooljet-postgrest.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Postgrest Selector labels
+*/}}
+{{- define "tooljet-postgrest.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "tooljet.name" . }}-postgrest
+app.kubernetes.io/component: {{ include "tooljet.name" . }}-postgrest
+app.kubernetes.io/instance: {{ .Release.Name }}-postgrest
+{{- end }}
+
 {{/*
 Create a default fully qualified postgresql name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
@@ -143,4 +164,4 @@ Return the appropriate apiVersion for autoscaling.
 {{- else -}}
 {{- print "autoscaling/v2beta2" -}}
 {{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/charts/tooljet/templates/deployment-pgrst.yml b/charts/tooljet/templates/deployment-pgrst.yml
index db1d287..be02081 100644
--- a/charts/tooljet/templates/deployment-pgrst.yml
+++ b/charts/tooljet/templates/deployment-pgrst.yml
@@ -4,24 +4,15 @@ metadata:
   name: {{ include "tooljet.fullname" . }}-postgrest
   labels:
     {{- include "tooljet.labels" . | nindent 4 }}
-    app.kubernetes.io/component: tooljet-postgrest
-    app.kubernetes.io/instance: tooljet-postgrest
-    app.kubernetes.io/name: tooljet-postgrest
 spec:
   replicas: {{ .Values.postgrest.replicaCount | default 1 }}
   selector:
     matchLabels:
-      {{- include "tooljet.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: tooljet-postgrest
-      app.kubernetes.io/instance: tooljet-postgrest
-      app.kubernetes.io/name: tooljet-postgrest
+      {{- include "tooljet-postgrest.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        {{- include "tooljet.selectorLabels" . | nindent 8 }}
-        app.kubernetes.io/component: tooljet-postgrest
-        app.kubernetes.io/instance: tooljet-postgrest
-        app.kubernetes.io/name: tooljet-postgrest
+        {{- include "tooljet-postgrest.selectorLabels" . | nindent 8 }}
     spec:
       containers:
         - name: postgrest
@@ -64,4 +55,4 @@ spec:
       {{- with .Values.postgrest.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
\ No newline at end of file
+      {{- end }}
diff --git a/charts/tooljet/templates/service-pgrst.yml b/charts/tooljet/templates/service-pgrst.yml
index 117e9c0..087663e 100644
--- a/charts/tooljet/templates/service-pgrst.yml
+++ b/charts/tooljet/templates/service-pgrst.yml
@@ -3,16 +3,10 @@ kind: Service
 metadata:
   name: {{ include "tooljet.fullname" . }}-postgrest
   labels:
-    {{- include "tooljet.labels" . | nindent 4 }}
-    app.kubernetes.io/component: tooljet-postgrest
-    app.kubernetes.io/instance: tooljet-postgrest
-    app.kubernetes.io/name: tooljet-postgrest
+    {{- include "tooljet-postgrest.labels" . | nindent 4 }}
 spec:
   selector:
-    {{- include "tooljet.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: tooljet-postgrest
-    app.kubernetes.io/instance: tooljet-postgrest
-    app.kubernetes.io/name: tooljet-postgrest
+    {{- include "tooljet-postgrest.selectorLabels" . | nindent 4 }}
   type: {{ .Values.postgrest.service.type }}
   ports:
     - name: http