diff --git a/_toc.yml b/_toc.yml
index 87003f1abeecf2a44ec57592420b7872f6ae4d69..b82b0d3aab1cfdc809b156edbd107031aa5cac11 100644
--- a/_toc.yml
+++ b/_toc.yml
@@ -20,3 +20,6 @@ parts:
       title: Brain segmentation 
     - file: fedbiomed-tutorial/brain-segmentation-solution.ipynb
       title: Brain segmentation - Solution
+  - caption: FAQ
+    chapters:
+    - file: faq/faq.md
diff --git a/faq/faq.md b/faq/faq.md
new file mode 100644
index 0000000000000000000000000000000000000000..56a837dbce4302a98ad3e161316b3daccab200b6
--- /dev/null
+++ b/faq/faq.md
@@ -0,0 +1,13 @@
+# Frequently Asked Questions
+
+## Will JupyterHub be accessible after the workshop?
+
+Unfortunately, no. We will shutdown the jupyterhub server at the end of each workshop day. 
+
+## What happens if I close a notebook or a terminal tab?
+
+No worries, the underlying process will continue to run. To reopen it, navigate to the jupytehub homepage (the IP address provided [here](/fedbiomed-tutorial/aws-instructions)) and click on the "Running" tab in the top left.
+
+## How to solve "fedbiomed Module Not Found" error
+
+This may be due to the wrong jupyter kernel being selected. In your notebook, under the `Kernel` tab, go to `Change kernel` and select `fedbiomed-researcher`.
diff --git a/index.md b/index.md
index ccbd034edb5178acfbf617222c5e73c7d05d0943..5c198f925e1b5d5dd3bfef6ab88ec0df3119b805 100644
--- a/index.md
+++ b/index.md
@@ -10,10 +10,10 @@ The program of the workshop is:
 
 - Introduction to FL and its importance in medical research ([slides](/fedbiomed-tutorial/slides))
 - Fed-BioMed introduction and MedNIST tutorial ([notebook](/fedbiomed-tutorial/intro-tutorial-mednist))
-- Hands-on exercise: detecting heart disease from tabular data ([notebook](fedbiomed-tutorial/tutorial-sklearn-exercise))
+- Hands-on exercise: detecting heart disease from tabular data ([notebook](fedbiomed-tutorial/tutorial-sklearn-problem))
 - Hands-on exercise: segmentation of brain MRI images ([notebook](fedbiomed-tutorial/brain-segmentation-exercise))
 
-## Material usage
+## Using Fed-BioMed during the workshop
 
 We provide a ready-to-use JupyterHub server. Follow the [instructions](/fedbiomed-tutorial/aws-instructions) to find out how to connect.