diff --git a/repo2docker/app.py b/repo2docker/app.py
index 41e831e2..71171405 100755
--- a/repo2docker/app.py
+++ b/repo2docker/app.py
@@ -662,8 +662,8 @@ def start_container(self):
                 "notebook",
                 "--ip=0.0.0.0",
                 f"--port={container_port}",
-                f"--NotebookApp.custom_display_url=http://{host_name}:{host_port}",
-                "--NotebookApp.default_url=/lab",
+                f"--ServerApp.custom_display_url=http://{host_name}:{host_port}",
+                "--ServerApp.default_url=/lab",
             ]
         else:
             # run_cmd given by user, if port is also given then pass it on
diff --git a/repo2docker/buildpacks/conda/environment.yml b/repo2docker/buildpacks/conda/environment.yml
index db704ddf..68b7524e 100644
--- a/repo2docker/buildpacks/conda/environment.yml
+++ b/repo2docker/buildpacks/conda/environment.yml
@@ -10,4 +10,4 @@ dependencies:
   - jupyter_server==2.*   # https://github.com/jupyter-server/jupyter_server
   - jupyterhub-singleuser==5.*   # https://github.com/jupyterhub/jupyterhub
   - jupyterlab==4.*   # https://github.com/jupyterlab/jupyterlab
-  - notebook==6.*   # https://github.com/jupyter/notebook
+  - notebook==7.*   # https://github.com/jupyter/notebook