diff --git a/setup.py b/setup.py
index f3e60d2faa1049405cd2ded8dd415a71e8634b99..1f3803088b5ee07dea72f8c1fe7a10bf39175f0a 100644
--- a/setup.py
+++ b/setup.py
@@ -74,6 +74,7 @@ install_requires = [
         "jupyter-core==5.7.1",
         "jupyter_client==8.6.0",
         "jupyter_console==6.6.3",
+        "jupyter-server==2.12.5",
         "kafka-python==2.0.2",
         "lxml==5.1.0",
         "markupsafe==2.1.5",
@@ -83,7 +84,6 @@ install_requires = [
         "nbconvert==7.16.1",
         "nbformat==5.9.2",
         "nbparameterise==0.6",
-        "notebook==7.1.1",
         "numpy==1.26.4",
         "pasha==0.1.1",
         "pillow==10.3.0",
diff --git a/src/cal_tools/tools.py b/src/cal_tools/tools.py
index 33425c118ee40a7d3240d99e36f3cc787662ed66..600a79e4d4a3601ced569ca008ef51b1f9d5b32c 100644
--- a/src/cal_tools/tools.py
+++ b/src/cal_tools/tools.py
@@ -23,7 +23,7 @@ import yaml
 import zmq
 from extra_data import H5File, RunDirectory
 from iCalibrationDB import ConstantMetaData, Versions
-from notebook.notebookapp import list_running_servers
+from jupyter_server.serverapp import list_running_servers
 
 from .ana_tools import save_dict_to_hdf5