diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/Chart.yaml
index 11240c3c4..bd5614aa9 100644
--- a/charts/jupyter-pyspark/Chart.yaml
+++ b/charts/jupyter-pyspark/Chart.yaml
@@ -24,7 +24,7 @@ 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: 3.0.4
+version: 3.1.0
 dependencies:
   - name: library-chart
     version: 2.0.3
diff --git a/charts/jupyter-pyspark/templates/statefulset.yaml b/charts/jupyter-pyspark/templates/statefulset.yaml
index 2f7b21103..9c7b5ad7a 100644
--- a/charts/jupyter-pyspark/templates/statefulset.yaml
+++ b/charts/jupyter-pyspark/templates/statefulset.yaml
@@ -68,6 +68,9 @@ spec:
       labels:
         {{- include "library-chart.selectorLabels" . | nindent 8 }}
     spec:
+      {{- if .Values.runtimeClassName -}}
+      runtimeClassName: {{ .Values.runtimeClassName }}
+      {{- end }}
       volumes:
         - name: config-files
           emptyDir: {}
diff --git a/charts/jupyter-pyspark/values.schema.json b/charts/jupyter-pyspark/values.schema.json
index 5ed4c70f9..354b85832 100644
--- a/charts/jupyter-pyspark/values.schema.json
+++ b/charts/jupyter-pyspark/values.schema.json
@@ -1157,6 +1157,15 @@
           "default": ""
         }
       }
+    },
+    "runtimeClassName" : {
+      "type": "string",
+      "description": "Runtime Class Name",
+      "default": "",
+      "x-onyxia": {
+        "hidden": true,
+        "overwriteSchemaWith": "ide/runtimeClassName.json"
+      }
     }
   }
 }
diff --git a/charts/jupyter-pyspark/values.yaml b/charts/jupyter-pyspark/values.yaml
index 65c885dbd..8e9c567df 100644
--- a/charts/jupyter-pyspark/values.yaml
+++ b/charts/jupyter-pyspark/values.yaml
@@ -292,3 +292,5 @@ certificates: {}
 message:
   fr: ""
   en: ""
+
+runtimeClassName: ""
diff --git a/charts/jupyter-python/Chart.yaml b/charts/jupyter-python/Chart.yaml
index 733d59f3e..2fc8d5bf0 100644
--- a/charts/jupyter-python/Chart.yaml
+++ b/charts/jupyter-python/Chart.yaml
@@ -22,7 +22,7 @@ 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.31
+version: 2.4.0
 dependencies:
   - name: library-chart
     version: 2.0.3
diff --git a/charts/jupyter-python/templates/statefulset.yaml b/charts/jupyter-python/templates/statefulset.yaml
index 56e7cbc91..d9c34a055 100644
--- a/charts/jupyter-python/templates/statefulset.yaml
+++ b/charts/jupyter-python/templates/statefulset.yaml
@@ -59,6 +59,9 @@ spec:
       labels:
         {{- include "library-chart.selectorLabels" . | nindent 8 }}
     spec:
+      {{- if .Values.runtimeClassName -}}
+      runtimeClassName: {{ .Values.runtimeClassName }}
+      {{- end }}
       volumes:
         - name: jupyter-local
           emptyDir: {}
diff --git a/charts/jupyter-python/values.schema.json b/charts/jupyter-python/values.schema.json
index 616286ddf..897f9eeb9 100644
--- a/charts/jupyter-python/values.schema.json
+++ b/charts/jupyter-python/values.schema.json
@@ -1099,6 +1099,15 @@
           "default": ""
         }
       }
+    },
+    "runtimeClassName" : {
+      "type": "string",
+      "description": "Runtime Class Name",
+      "default": "",
+      "x-onyxia": {
+        "hidden": true,
+        "overwriteSchemaWith": "ide/runtimeClassName.json"
+      }
     }
   }
 }
diff --git a/charts/jupyter-python/values.yaml b/charts/jupyter-python/values.yaml
index 9b8b4b3f5..22acc8939 100644
--- a/charts/jupyter-python/values.yaml
+++ b/charts/jupyter-python/values.yaml
@@ -265,3 +265,5 @@ certificates: {}
 message:
   fr: ""
   en: ""
+
+runtimeClassName: ""
diff --git a/charts/rstudio-sparkr/Chart.yaml b/charts/rstudio-sparkr/Chart.yaml
index 288c5aa31..eff5cdd6d 100644
--- a/charts/rstudio-sparkr/Chart.yaml
+++ b/charts/rstudio-sparkr/Chart.yaml
@@ -23,7 +23,7 @@ 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: 3.0.3
+version: 3.1.0
 dependencies:
   - name: library-chart
     version: 2.0.3
diff --git a/charts/rstudio-sparkr/templates/statefulset.yaml b/charts/rstudio-sparkr/templates/statefulset.yaml
index bf468e418..05e7f91c3 100644
--- a/charts/rstudio-sparkr/templates/statefulset.yaml
+++ b/charts/rstudio-sparkr/templates/statefulset.yaml
@@ -53,6 +53,9 @@ spec:
       labels:
         {{- include "library-chart.selectorLabels" . | nindent 8 }}
     spec:
+      {{- if .Values.runtimeClassName -}}
+      runtimeClassName: {{ .Values.runtimeClassName }}
+      {{- end }}
       volumes:
         - name: config-files
           emptyDir: {}
diff --git a/charts/rstudio-sparkr/values.schema.json b/charts/rstudio-sparkr/values.schema.json
index 433edb9f1..43310bbde 100644
--- a/charts/rstudio-sparkr/values.schema.json
+++ b/charts/rstudio-sparkr/values.schema.json
@@ -1052,6 +1052,15 @@
           "default": ""
         }
       }
+    },
+    "runtimeClassName" : {
+      "type": "string",
+      "description": "Runtime Class Name",
+      "default": "",
+      "x-onyxia": {
+        "hidden": true,
+        "overwriteSchemaWith": "ide/runtimeClassName.json"
+      }
     }
   }
 }
diff --git a/charts/rstudio-sparkr/values.yaml b/charts/rstudio-sparkr/values.yaml
index 947670f9f..bfc187b32 100644
--- a/charts/rstudio-sparkr/values.yaml
+++ b/charts/rstudio-sparkr/values.yaml
@@ -273,3 +273,5 @@ certificates: {}
 message:
   fr: ""
   en: ""
+
+runtimeClassName: ""
diff --git a/charts/rstudio/Chart.yaml b/charts/rstudio/Chart.yaml
index d7c0347b2..9b2ada9b9 100644
--- a/charts/rstudio/Chart.yaml
+++ b/charts/rstudio/Chart.yaml
@@ -22,7 +22,7 @@ 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.23
+version: 2.4.0
 dependencies:
   - name: library-chart
     version: 2.0.3
diff --git a/charts/rstudio/templates/statefulset.yaml b/charts/rstudio/templates/statefulset.yaml
index 34842639e..05db485e4 100644
--- a/charts/rstudio/templates/statefulset.yaml
+++ b/charts/rstudio/templates/statefulset.yaml
@@ -44,6 +44,9 @@ spec:
       labels:
         {{- include "library-chart.selectorLabels" . | nindent 8 }}
     spec:
+      {{- if .Values.runtimeClassName -}}
+      runtimeClassName: {{ .Values.runtimeClassName }}
+      {{- end }}
       volumes:
         - name: config-files
           emptyDir: {}
diff --git a/charts/rstudio/values.schema.json b/charts/rstudio/values.schema.json
index 6fa5af09b..b90d9ee38 100644
--- a/charts/rstudio/values.schema.json
+++ b/charts/rstudio/values.schema.json
@@ -970,6 +970,15 @@
           "default": ""
         }
       }
+    },
+    "runtimeClassName" : {
+      "type": "string",
+      "description": "Runtime Class Name",
+      "default": "",
+      "x-onyxia": {
+        "hidden": true,
+        "overwriteSchemaWith": "ide/runtimeClassName.json"
+      }
     }
   }
 }
diff --git a/charts/rstudio/values.yaml b/charts/rstudio/values.yaml
index 5817687f5..03d169e08 100644
--- a/charts/rstudio/values.yaml
+++ b/charts/rstudio/values.yaml
@@ -227,3 +227,5 @@ proxy:
 message:
   fr: ""
   en: ""
+
+runtimeClassName: ""
diff --git a/charts/vscode-pyspark/Chart.yaml b/charts/vscode-pyspark/Chart.yaml
index 8188cb6e3..6fcaa88e6 100644
--- a/charts/vscode-pyspark/Chart.yaml
+++ b/charts/vscode-pyspark/Chart.yaml
@@ -24,7 +24,7 @@ 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: 3.0.6
+version: 3.1.0
 dependencies:
   - name: library-chart
     version: 2.0.3
diff --git a/charts/vscode-pyspark/templates/statefulset.yaml b/charts/vscode-pyspark/templates/statefulset.yaml
index 2029124c2..0c3d728e5 100644
--- a/charts/vscode-pyspark/templates/statefulset.yaml
+++ b/charts/vscode-pyspark/templates/statefulset.yaml
@@ -68,6 +68,9 @@ spec:
       labels:
         {{- include "library-chart.selectorLabels" . | nindent 8 }}
     spec:
+      {{- if .Values.runtimeClassName -}}
+      runtimeClassName: {{ .Values.runtimeClassName }}
+      {{- end }}
       volumes:
         - name: home
         {{- if .Values.persistence.enabled }}
diff --git a/charts/vscode-pyspark/values.schema.json b/charts/vscode-pyspark/values.schema.json
index 903fae60a..6b6271ca1 100644
--- a/charts/vscode-pyspark/values.schema.json
+++ b/charts/vscode-pyspark/values.schema.json
@@ -1151,6 +1151,15 @@
           "default": ""
         }
       }
+    },
+    "runtimeClassName" : {
+      "type": "string",
+      "description": "Runtime Class Name",
+      "default": "",
+      "x-onyxia": {
+        "hidden": true,
+        "overwriteSchemaWith": "ide/runtimeClassName.json"
+      }
     }
   }
 }
diff --git a/charts/vscode-pyspark/values.yaml b/charts/vscode-pyspark/values.yaml
index 937ae8857..22f32fbcb 100644
--- a/charts/vscode-pyspark/values.yaml
+++ b/charts/vscode-pyspark/values.yaml
@@ -294,3 +294,5 @@ certificates: {}
 message:
   fr: ""
   en: ""
+
+runtimeClassName: ""
diff --git a/charts/vscode-python/Chart.yaml b/charts/vscode-python/Chart.yaml
index e7d467473..a79a15c1a 100644
--- a/charts/vscode-python/Chart.yaml
+++ b/charts/vscode-python/Chart.yaml
@@ -22,7 +22,7 @@ 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.4.5
+version: 2.5.0
 dependencies:
   - name: library-chart
     version: 2.0.3
diff --git a/charts/vscode-python/templates/statefulset.yaml b/charts/vscode-python/templates/statefulset.yaml
index 6cd8c29a6..5a537da7a 100644
--- a/charts/vscode-python/templates/statefulset.yaml
+++ b/charts/vscode-python/templates/statefulset.yaml
@@ -59,6 +59,9 @@ spec:
       labels:
         {{- include "library-chart.selectorLabels" . | nindent 8 }}
     spec:
+      {{- if .Values.runtimeClassName -}}
+      runtimeClassName: {{ .Values.runtimeClassName }}
+      {{- end }}
       volumes:
         - name: config-files
           emptyDir: {}
diff --git a/charts/vscode-python/values.schema.json b/charts/vscode-python/values.schema.json
index 0cf584952..ee262d8f9 100644
--- a/charts/vscode-python/values.schema.json
+++ b/charts/vscode-python/values.schema.json
@@ -1119,6 +1119,15 @@
           "default": ""
         }
       }
+    },
+    "runtimeClassName" : {
+      "type": "string",
+      "description": "Runtime Class Name",
+      "default": "",
+      "x-onyxia": {
+        "hidden": true,
+        "overwriteSchemaWith": "ide/runtimeClassName.json"
+      }
     }
   }
 }
diff --git a/charts/vscode-python/values.yaml b/charts/vscode-python/values.yaml
index 79a31591f..f9b4abddd 100644
--- a/charts/vscode-python/values.yaml
+++ b/charts/vscode-python/values.yaml
@@ -269,3 +269,5 @@ certificates: {}
 message:
   fr: ""
   en: ""
+
+runtimeClassName: ""