diff --git a/mybinder/files/etc/jupyter/jupyter_notebook_config.py b/mybinder/files/etc/jupyter/jupyter_notebook_config.py
index b69d6744d..78f59ffc5 100644
--- a/mybinder/files/etc/jupyter/jupyter_notebook_config.py
+++ b/mybinder/files/etc/jupyter/jupyter_notebook_config.py
@@ -3,7 +3,7 @@
 
 import notebook
 
-c.NotebookApp.extra_template_paths.append("/etc/jupyter/templates")
+c.ServerApp.extra_template_paths.append("/etc/jupyter/templates")
 
 
 # For old notebook versions we have to explicitly enable the translation
@@ -21,7 +21,7 @@
 # Disable JITSI integration for now
 jitsi_url = ""
 
-c.NotebookApp.jinja_template_vars.update(
+c.ServerApp.jinja_template_vars.update(
     {
         "binder_url": binder_launch_host + binder_request,
         "persistent_binder_url": binder_launch_host + binder_persistent_request,
diff --git a/mybinder/values.yaml b/mybinder/values.yaml
index e6bb045a6..81ea40286 100644
--- a/mybinder/values.yaml
+++ b/mybinder/values.yaml
@@ -42,7 +42,7 @@ tags: {}
 
 etcJupyter:
   jupyter_notebook_config.json:
-    NotebookApp:
+    ServerApp:
       allow_origin: "*"
       tornado_settings:
         trust_xheaders: true