diff --git a/README.md b/README.md
index a1ed2854..7053e866 100644
--- a/README.md
+++ b/README.md
@@ -32,8 +32,13 @@ in working on the project.
 
 Following [Jupyter Notebook notice](https://github.com/jupyter/notebook#notice), we encourage users to transition to JupyterLab.
 This can be done by passing the environment variable `JUPYTER_ENABLE_LAB=yes` at container startup, 
-more information in the [documentation](https://jupyter-docker-stacks.readthedocs.io/en/latest/using/common.html).
-This change is followed in the issue [#1217](https://github.com/jupyter/docker-stacks/issues/1217).
+more information is available in the [documentation](https://jupyter-docker-stacks.readthedocs.io/en/latest/using/common.html).
+
+In April 2021 JupyterLab will become the default, however a new environment variable will be introduced to switch back to Jupyter Notebook if needed.
+
+Next, and according to the Jupyter Notebook project status and its compatibility with JupyterLab, it could be abandoned in favor of another *classic-like* UI.
+
+This change is tracked in the issue [#1217](https://github.com/jupyter/docker-stacks/issues/1217), please check its content for more information.
 
 ## Quick Start
 
diff --git a/base-notebook/start-notebook.sh b/base-notebook/start-notebook.sh
index 3ff3a88e..499634af 100755
--- a/base-notebook/start-notebook.sh
+++ b/base-notebook/start-notebook.sh
@@ -15,6 +15,6 @@ if [[ ! -z "${JUPYTERHUB_API_TOKEN}" ]]; then
 elif [[ ! -z "${JUPYTER_ENABLE_LAB}" ]]; then
     . /usr/local/bin/start.sh $wrapper jupyter lab "$@"
 else
-    echo "WARN: Jupyter Notebook deprecation notice https://github.com/jupyter/notebook#notice."
+    echo "WARN: Jupyter Notebook deprecation notice https://github.com/jupyter/docker-stacks#jupyter-notebook-deprecation-notice."
     . /usr/local/bin/start.sh $wrapper jupyter notebook "$@"
 fi
diff --git a/base-notebook/test/test_start_script.py b/base-notebook/test/test_start_script.py
index 76575e41..8b3f9759 100644
--- a/base-notebook/test/test_start_script.py
+++ b/base-notebook/test/test_start_script.py
@@ -29,5 +29,5 @@ def test_start_notebook(container, http_client, env, expected_server):
     ), f"Not the expected command (jupyter {expected_server}) was launched"
     # Checking warning messages
     if not env:
-        msg = "WARN: Jupyter Notebook deprecation notice https://github.com/jupyter/notebook#notice."
+        msg = "WARN: Jupyter Notebook deprecation notice"
         assert msg in logs, f"Expected warning message {msg} not printed"