diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/Chart.yaml
index 6ce6f317..d3c9dabf 100644
--- a/charts/jupyter-pyspark/Chart.yaml
+++ b/charts/jupyter-pyspark/Chart.yaml
@@ -24,8 +24,8 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.3.13
+version: 2.3.14
 dependencies:
   - name: library-chart
-    version: 1.7.6
+    version: 1.7.11
     repository: https://inseefrlab.github.io/helm-charts-interactive-services
diff --git a/charts/jupyter-pyspark/templates/secret-postgresql.yaml b/charts/jupyter-pyspark/templates/secret-postgresql.yaml
new file mode 100644
index 00000000..cf056bee
--- /dev/null
+++ b/charts/jupyter-pyspark/templates/secret-postgresql.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.secretPostgreSQL" . }}
diff --git a/charts/jupyter-pyspark/templates/statefulset.yaml b/charts/jupyter-pyspark/templates/statefulset.yaml
index 7d0a905e..d832c1b2 100644
--- a/charts/jupyter-pyspark/templates/statefulset.yaml
+++ b/charts/jupyter-pyspark/templates/statefulset.yaml
@@ -50,6 +50,9 @@ spec:
         {{- if not (empty (trim (include "library-chart.secretMilvus" .))) }}
         checksum/milvus: {{ include (print $.Template.BasePath "/secret-milvus.yaml") . | sha256sum }}
         {{- end }}
+        {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }}
+        checksum/postgresql: {{ include (print $.Template.BasePath "/secret-postgresql.yaml") . | sha256sum }}
+        {{- end }}
         {{- if (include "library-chart.repository.enabled"  .) }}
         checksum/repository: {{ include (print $.Template.BasePath "/configmap-repository.yaml") . | sha256sum }}
         {{- end }}
@@ -281,6 +284,10 @@ spec:
             - secretRef:
                 name: {{ include "library-chart.secretNameMilvus" . }}
             {{- end }}
+            {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }}
+            - secretRef:
+                name: {{ include "library-chart.secretNamePostgreSQL" . }}
+            {{- end }}
             {{- if .Values.extraEnvVars }}
             - secretRef:
                 name: {{ include "library-chart.secretNameExtraEnv" . }}
diff --git a/charts/jupyter-pyspark/values.schema.json b/charts/jupyter-pyspark/values.schema.json
index 37e267fe..dfc2915b 100644
--- a/charts/jupyter-pyspark/values.schema.json
+++ b/charts/jupyter-pyspark/values.schema.json
@@ -656,6 +656,11 @@
           "title": "Discover Milvus services",
           "type": "boolean",
           "default": true
+        },
+        "postgresql": {
+          "title": "Discover PostgreSQL services",
+          "type": "boolean",
+          "default": true
         }
       }
     },
diff --git a/charts/jupyter-pyspark/values.yaml b/charts/jupyter-pyspark/values.yaml
index 25eecadb..b8850759 100644
--- a/charts/jupyter-pyspark/values.yaml
+++ b/charts/jupyter-pyspark/values.yaml
@@ -116,6 +116,7 @@ discovery:
   metaflow: true
   chromadb: true
   milvus: true
+  postgresql: true
 
 hive:
   secretName: ""
@@ -132,6 +133,9 @@ chromadb:
 milvus:
   secretName: ""
 
+postgresql:
+  secretName: ""
+
 coresite:
   secretName: ""
 
diff --git a/charts/jupyter-python/Chart.yaml b/charts/jupyter-python/Chart.yaml
index a6ef5466..296a8cd0 100644
--- a/charts/jupyter-python/Chart.yaml
+++ b/charts/jupyter-python/Chart.yaml
@@ -22,8 +22,8 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.3.15
+version: 2.3.16
 dependencies:
   - name: library-chart
-    version: 1.7.6
+    version: 1.7.11
     repository: https://inseefrlab.github.io/helm-charts-interactive-services
diff --git a/charts/jupyter-python/templates/secret-postgresql.yaml b/charts/jupyter-python/templates/secret-postgresql.yaml
new file mode 100644
index 00000000..cf056bee
--- /dev/null
+++ b/charts/jupyter-python/templates/secret-postgresql.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.secretPostgreSQL" . }}
diff --git a/charts/jupyter-python/templates/statefulset.yaml b/charts/jupyter-python/templates/statefulset.yaml
index 6890687b..c36efe88 100644
--- a/charts/jupyter-python/templates/statefulset.yaml
+++ b/charts/jupyter-python/templates/statefulset.yaml
@@ -44,6 +44,9 @@ spec:
         {{- if not (empty (trim (include "library-chart.secretMilvus" .))) }}
         checksum/milvus: {{ include (print $.Template.BasePath "/secret-milvus.yaml") . | sha256sum }}
         {{- end }}
+        {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }}
+        checksum/postgresql: {{ include (print $.Template.BasePath "/secret-postgresql.yaml") . | sha256sum }}
+        {{- end }}
         {{- if (include "library-chart.repository.enabled"  .) }}
         checksum/repository: {{ include (print $.Template.BasePath "/configmap-repository.yaml") . | sha256sum }}
         {{- end }}
@@ -232,6 +235,10 @@ spec:
             - secretRef:
                 name: {{ include "library-chart.secretNameMilvus" . }}
             {{- end }}
+            {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }}
+            - secretRef:
+                name: {{ include "library-chart.secretNamePostgreSQL" . }}
+            {{- end }}
             {{- if .Values.extraEnvVars }}
             - secretRef:
                 name: {{ include "library-chart.secretNameExtraEnv" . }}
diff --git a/charts/jupyter-python/values.schema.json b/charts/jupyter-python/values.schema.json
index 1107f4d4..47171207 100644
--- a/charts/jupyter-python/values.schema.json
+++ b/charts/jupyter-python/values.schema.json
@@ -609,6 +609,11 @@
           "title": "Discover Milvus services",
           "type": "boolean",
           "default": true
+        },
+        "postgresql": {
+          "title": "Discover PostgreSQL services",
+          "type": "boolean",
+          "default": true
         }
       }
     },
diff --git a/charts/jupyter-python/values.yaml b/charts/jupyter-python/values.yaml
index 3e0f53ec..ebb26089 100644
--- a/charts/jupyter-python/values.yaml
+++ b/charts/jupyter-python/values.yaml
@@ -85,6 +85,7 @@ discovery:
   metaflow: true
   chromadb: true
   milvus: true
+  postgresql: true
 
 hive:
   secretName: ""
@@ -101,6 +102,9 @@ chromadb:
 milvus:
   secretName: ""
 
+postgresql:
+  secretName: ""
+
 coresite:
   secretName: ""
 
diff --git a/charts/rstudio-sparkr/Chart.yaml b/charts/rstudio-sparkr/Chart.yaml
index 97bcf3fd..520ca529 100644
--- a/charts/rstudio-sparkr/Chart.yaml
+++ b/charts/rstudio-sparkr/Chart.yaml
@@ -23,8 +23,8 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.3.8
+version: 2.3.9
 dependencies:
   - name: library-chart
-    version: 1.7.6
+    version: 1.7.11
     repository: https://inseefrlab.github.io/helm-charts-interactive-services
diff --git a/charts/rstudio-sparkr/templates/secret-postgresql.yaml b/charts/rstudio-sparkr/templates/secret-postgresql.yaml
new file mode 100644
index 00000000..cf056bee
--- /dev/null
+++ b/charts/rstudio-sparkr/templates/secret-postgresql.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.secretPostgreSQL" . }}
diff --git a/charts/rstudio-sparkr/templates/statefulset.yaml b/charts/rstudio-sparkr/templates/statefulset.yaml
index 8cfacd39..f6ede0c1 100644
--- a/charts/rstudio-sparkr/templates/statefulset.yaml
+++ b/charts/rstudio-sparkr/templates/statefulset.yaml
@@ -32,6 +32,9 @@ spec:
         {{- if not (empty (trim (include "library-chart.secretHive" .))) }}
         checksum/hive: {{ include (print $.Template.BasePath "/secret-hive.yaml") . | sha256sum }}
         {{- end }}
+        {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }}
+        checksum/postgresql: {{ include (print $.Template.BasePath "/secret-postgresql.yaml") . | sha256sum }}
+        {{- end }}
         {{- if not (empty (trim (include "library-chart.secretIvySettings" .))) }}
         checksum/ivysettings: {{ include (print $.Template.BasePath "/secret-ivysettings.yaml") . | sha256sum }}
         {{- end }}
@@ -238,6 +241,10 @@ spec:
             - configMapRef:
                 name: {{ include "library-chart.configMapNameRepository" . }}
             {{- end }}
+            {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }}
+            - secretRef:
+                name: {{ include "library-chart.secretNamePostgreSQL" . }}
+            {{- end }}
             {{- if .Values.extraEnvVars }}
             - secretRef:
                 name: {{ include "library-chart.secretNameExtraEnv" . }}
diff --git a/charts/rstudio-sparkr/values.schema.json b/charts/rstudio-sparkr/values.schema.json
index b2c9b839..a853cf71 100644
--- a/charts/rstudio-sparkr/values.schema.json
+++ b/charts/rstudio-sparkr/values.schema.json
@@ -614,6 +614,11 @@
           "title": "Discover Hive Metastore services",
           "type": "boolean",
           "default": true
+        },
+        "postgresql": {
+          "title": "Discover PostgreSQL services",
+          "type": "boolean",
+          "default": true
         }
       }
     },
diff --git a/charts/rstudio-sparkr/values.yaml b/charts/rstudio-sparkr/values.yaml
index 68be3d5f..99bf60f9 100644
--- a/charts/rstudio-sparkr/values.yaml
+++ b/charts/rstudio-sparkr/values.yaml
@@ -98,10 +98,14 @@ git:
 
 discovery:
   hive: true
+  postgresql: true
 
 hive:
   secretName: ""
 
+postgresql:
+  secretName: ""
+
 coresite:
   secretName: ""
 
diff --git a/charts/rstudio/Chart.yaml b/charts/rstudio/Chart.yaml
index fac638f8..44f23149 100644
--- a/charts/rstudio/Chart.yaml
+++ b/charts/rstudio/Chart.yaml
@@ -22,8 +22,8 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.3.9
+version: 2.3.10
 dependencies:
   - name: library-chart
-    version: 1.7.6
+    version: 1.7.11
     repository: https://inseefrlab.github.io/helm-charts-interactive-services
diff --git a/charts/rstudio/templates/secret-postgresql.yaml b/charts/rstudio/templates/secret-postgresql.yaml
new file mode 100644
index 00000000..cf056bee
--- /dev/null
+++ b/charts/rstudio/templates/secret-postgresql.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.secretPostgreSQL" . }}
diff --git a/charts/rstudio/templates/statefulset.yaml b/charts/rstudio/templates/statefulset.yaml
index 4204e33e..42975e7f 100644
--- a/charts/rstudio/templates/statefulset.yaml
+++ b/charts/rstudio/templates/statefulset.yaml
@@ -29,6 +29,9 @@ spec:
         {{- if .Values.vault.enabled }}
         checksum/vault: {{ include (print $.Template.BasePath "/secret-vault.yaml") . | sha256sum }}
         {{- end }}
+        {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }}
+        checksum/postgresql: {{ include (print $.Template.BasePath "/secret-postgresql.yaml") . | sha256sum }}
+        {{- end }}
         {{- if (include "library-chart.repository.enabled"  .) }}
         checksum/repository: {{ include (print $.Template.BasePath "/configmap-repository.yaml") . | sha256sum }}
         {{- end }}
@@ -171,6 +174,10 @@ spec:
             - configMapRef:
                 name: {{ include "library-chart.configMapNameRepository" . }}
             {{- end }}
+            {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }}
+            - secretRef:
+                name: {{ include "library-chart.secretNamePostgreSQL" . }}
+            {{- end }}
             - secretRef:
                 name: {{ include "library-chart.secretNameToken" . }}
             {{- if .Values.extraEnvVars }}
diff --git a/charts/rstudio/values.schema.json b/charts/rstudio/values.schema.json
index 1d1e3dcd..48d0081a 100644
--- a/charts/rstudio/values.schema.json
+++ b/charts/rstudio/values.schema.json
@@ -581,6 +581,17 @@
         }
       }
     },
+    "discovery": {
+      "title": "Third party services discovery",
+      "type": "object",
+      "properties": {
+        "postgresql": {
+          "title": "Discover PostgreSQL services",
+          "type": "boolean",
+          "default": true
+        }
+      }
+    },
     "security": {
       "title": "Security",
       "type": "object",
diff --git a/charts/rstudio/values.yaml b/charts/rstudio/values.yaml
index 4f3bb62c..174d57df 100644
--- a/charts/rstudio/values.yaml
+++ b/charts/rstudio/values.yaml
@@ -77,6 +77,12 @@ repository:
   packageManagerUrl: ""
   rRepository: ""
 
+discovery:
+  postgresql: true
+
+postgresql:
+  secretName: ""
+
 replicaCount: 1
 
 imagePullSecrets: []
diff --git a/charts/vscode-pyspark/Chart.yaml b/charts/vscode-pyspark/Chart.yaml
index abafa3d9..159b42a1 100644
--- a/charts/vscode-pyspark/Chart.yaml
+++ b/charts/vscode-pyspark/Chart.yaml
@@ -24,8 +24,8 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.3.13
+version: 2.3.14
 dependencies:
   - name: library-chart
-    version: 1.7.6
+    version: 1.7.11
     repository: https://inseefrlab.github.io/helm-charts-interactive-services
diff --git a/charts/vscode-pyspark/templates/secret-postgresql.yaml b/charts/vscode-pyspark/templates/secret-postgresql.yaml
new file mode 100644
index 00000000..cf056bee
--- /dev/null
+++ b/charts/vscode-pyspark/templates/secret-postgresql.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.secretPostgreSQL" . }}
diff --git a/charts/vscode-pyspark/templates/statefulset.yaml b/charts/vscode-pyspark/templates/statefulset.yaml
index 961546b9..df60cec8 100644
--- a/charts/vscode-pyspark/templates/statefulset.yaml
+++ b/charts/vscode-pyspark/templates/statefulset.yaml
@@ -45,11 +45,14 @@ spec:
         checksum/mlflow: {{ include (print $.Template.BasePath "/secret-mlflow.yaml") . | sha256sum }}
         {{- end }}
         {{- if not (empty (trim (include "library-chart.secretChromaDB" .))) }}
-        checksum/mlflow: {{ include (print $.Template.BasePath "/secret-chromadb.yaml") . | sha256sum }}
+        checksum/chromadb: {{ include (print $.Template.BasePath "/secret-chromadb.yaml") . | sha256sum }}
         {{- end }}
         {{- if not (empty (trim (include "library-chart.secretMilvus" .))) }}
         checksum/milvus: {{ include (print $.Template.BasePath "/secret-milvus.yaml") . | sha256sum }}
         {{- end }}
+        {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }}
+        checksum/postgresql: {{ include (print $.Template.BasePath "/secret-postgresql.yaml") . | sha256sum }}
+        {{- end }}
         {{- if (include "library-chart.repository.enabled"  .) }}
         checksum/repository: {{ include (print $.Template.BasePath "/configmap-repository.yaml") . | sha256sum }}
         {{- end }}
@@ -283,6 +286,10 @@ spec:
             - secretRef:
                 name: {{ include "library-chart.secretNameMLFlow" . }}
             {{- end }}
+            {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }}
+            - secretRef:
+                name: {{ include "library-chart.secretNamePostgreSQL" . }}
+            {{- end }}
             {{- if not (empty (trim (include "library-chart.secretChromaDB" .))) }}
             - secretRef:
                 name: {{ include "library-chart.secretNameChromaDB" . }}
diff --git a/charts/vscode-pyspark/values.schema.json b/charts/vscode-pyspark/values.schema.json
index c2f4f60d..229bce77 100644
--- a/charts/vscode-pyspark/values.schema.json
+++ b/charts/vscode-pyspark/values.schema.json
@@ -640,6 +640,11 @@
           "title": "Discover Milvus services",
           "type": "boolean",
           "default": true
+        },
+        "postgresql": {
+          "title": "Discover PostgreSQL services",
+          "type": "boolean",
+          "default": true
         }
       }
     },
diff --git a/charts/vscode-pyspark/values.yaml b/charts/vscode-pyspark/values.yaml
index 4bb3cbcf..62be0c34 100644
--- a/charts/vscode-pyspark/values.yaml
+++ b/charts/vscode-pyspark/values.yaml
@@ -116,6 +116,7 @@ discovery:
   metaflow: true
   chromadb: true
   milvus: true
+  postgresql: true
 
 hive:
   secretName: ""
@@ -132,6 +133,9 @@ chromadb:
 milvus:
   secretName: ""
 
+postgresql:
+  secretName: ""
+
 coresite:
   secretName: ""
 
diff --git a/charts/vscode-python/Chart.yaml b/charts/vscode-python/Chart.yaml
index 0b84e83d..7caec00b 100644
--- a/charts/vscode-python/Chart.yaml
+++ b/charts/vscode-python/Chart.yaml
@@ -22,8 +22,8 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.3.15
+version: 2.3.16
 dependencies:
   - name: library-chart
-    version: 1.7.6
+    version: 1.7.11
     repository: https://inseefrlab.github.io/helm-charts-interactive-services
diff --git a/charts/vscode-python/templates/secret-postgresql.yaml b/charts/vscode-python/templates/secret-postgresql.yaml
new file mode 100644
index 00000000..cf056bee
--- /dev/null
+++ b/charts/vscode-python/templates/secret-postgresql.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.secretPostgreSQL" . }}
diff --git a/charts/vscode-python/templates/statefulset.yaml b/charts/vscode-python/templates/statefulset.yaml
index 15112455..734f0c80 100644
--- a/charts/vscode-python/templates/statefulset.yaml
+++ b/charts/vscode-python/templates/statefulset.yaml
@@ -44,6 +44,9 @@ spec:
         {{- if not (empty (trim (include "library-chart.secretMilvus" .))) }}
         checksum/milvus: {{ include (print $.Template.BasePath "/secret-milvus.yaml") . | sha256sum }}
         {{- end }}
+        {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }}
+        checksum/postgresql: {{ include (print $.Template.BasePath "/secret-postgresql.yaml") . | sha256sum }}
+        {{- end }}
         {{- if (include "library-chart.repository.enabled"  .) }}
         checksum/repository: {{ include (print $.Template.BasePath "/configmap-repository.yaml") . | sha256sum }}
         {{- end }}
@@ -225,6 +228,10 @@ spec:
             - secretRef:
                 name: {{ include "library-chart.secretNameMLFlow" . }}
             {{- end }}
+            {{- if not (empty (trim (include "library-chart.secretPostgreSQL" .))) }}
+            - secretRef:
+                name: {{ include "library-chart.secretNamePostgreSQL" . }}
+            {{- end }}
             {{- if not (empty (trim (include "library-chart.secretChromaDB" .))) }}
             - secretRef:
                 name: {{ include "library-chart.secretNameChromaDB" . }}
diff --git a/charts/vscode-python/values.schema.json b/charts/vscode-python/values.schema.json
index b0bbddaa..a8c87b99 100644
--- a/charts/vscode-python/values.schema.json
+++ b/charts/vscode-python/values.schema.json
@@ -645,6 +645,11 @@
           "title": "Discover Milvus services",
           "type": "boolean",
           "default": true
+        },
+        "postgresql": {
+          "title": "Discover PostgreSQL services",
+          "type": "boolean",
+          "default": true
         }
       }
     },
diff --git a/charts/vscode-python/values.yaml b/charts/vscode-python/values.yaml
index b2a79559..fdffcbd3 100644
--- a/charts/vscode-python/values.yaml
+++ b/charts/vscode-python/values.yaml
@@ -80,6 +80,7 @@ discovery:
   metaflow: true
   chromadb: true
   milvus: true
+  postgresql: true
 
 hive:
   secretName: ""
@@ -99,6 +100,9 @@ milvus:
 coresite:
   secretName: ""
 
+postgresql:
+  secretName: ""
+
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 replicaCount: 1