diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 97ca9eac..28d0091d 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.2
+current_version = 2.0.4
 commit = True
 tag = False
 tag_name = {new_version}
@@ -30,11 +30,11 @@ search = {current_version}
 replace = {new_version}
 
 [bumpversion:file:RELEASE.txt]
-search = {current_version} 2023-12-15T17:42:58Z
+search = {current_version} 2024-01-18T14:27:21Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2023-12-15T17:42:58Z
+values = 2024-01-18T14:27:21Z
 
 [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'
diff --git a/CHANGES.md b/CHANGES.md
index 0798d899..6297527d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -46,6 +46,30 @@
     at [Ouranosinc/pavics-sdi](https://github.com/Ouranosinc/pavics-sdi) instead
     of intended [bird-house/birdhouse-deploy](https://github.com/bird-house/birdhouse-deploy).
 
+[2.0.4](https://github.com/bird-house/birdhouse-deploy/tree/2.0.4) (2024-01-18)
+------------------------------------------------------------------------------------------------------------------
+
+## Fixes
+
+- Allow users to log in to Jupyterhub with their email address
+
+  Previously, JupyterHub's `MagpieAuthenticator` class treated the email address entered into the username field as
+  the username itself. This led to a mismatch between the username in JupyterHub and the username in Magpie.
+  To resolve this, we update the JupyterHub docker image to a version where this bug is fixed. 
+
+  See https://github.com/Ouranosinc/jupyterhub/pull/26 and https://github.com/Ouranosinc/Magpie/issues/598 for 
+  reference.
+
+[2.0.3](https://github.com/bird-house/birdhouse-deploy/tree/2.0.3) (2024-01-16)
+------------------------------------------------------------------------------------------------------------------
+
+## Fixes
+
+- Autodeploy broken due to instanciated left-over files in ./config/ dir
+
+  The `.gitignore` syntax was wrong.  Regression from v2.0.0.
+
+
 [2.0.2](https://github.com/bird-house/birdhouse-deploy/tree/2.0.2) (2023-12-15)
 ------------------------------------------------------------------------------------------------------------------
 
diff --git a/Makefile b/Makefile
index 4bc5d908..e23b7aa6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 2.0.2
+override APP_VERSION := 2.0.4
 
 # utility to remove comments after value of an option variable
 override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")
diff --git a/README.rst b/README.rst
index b3290151..739fae2b 100644
--- a/README.rst
+++ b/README.rst
@@ -14,13 +14,13 @@ for a full-fledged production platform.
     * - releases
       - | |latest-version| |commits-since|
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.0.2.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.0.4.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/2.0.2...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/2.0.4...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-2.0.2-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-2.0.4-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/2.0.2
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/2.0.4
 
 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
     :alt: ReadTheDocs Build Status (latest version)
diff --git a/RELEASE.txt b/RELEASE.txt
index fe467292..9f8dbd05 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -1 +1 @@
-2.0.2 2023-12-15T17:42:58Z
+2.0.4 2024-01-18T14:27:21Z
diff --git a/birdhouse/.gitignore b/birdhouse/.gitignore
index f6a2dff5..5b8a7b86 100644
--- a/birdhouse/.gitignore
+++ b/birdhouse/.gitignore
@@ -1 +1 @@
-./config
+/config/
diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template
index 6a5c946f..bf7662c1 100644
--- a/birdhouse/components/canarie-api/docker_configuration.py.template
+++ b/birdhouse/components/canarie-api/docker_configuration.py.template
@@ -109,10 +109,10 @@ SERVICES = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '2.0.2',
-            'releaseTime': '2023-12-15T17:42:58Z',
-            'institution': '${SERVER_INSTITUTION}',
-            'researchSubject': '${SERVER_SUBJECT}',
+            'version': '2.0.4',
+            'releaseTime': '2024-01-18T14:27:21Z',
+            'institution': 'Ouranos',
+            'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',
             'category': 'Resource/Cloud Management',
             'tags': [tag.strip() for tag in "${SERVER_TAGS}".split(",") if tag.strip()],
@@ -142,8 +142,8 @@ PLATFORMS = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '2.0.2',
-            'releaseTime': '2023-12-15T17:42:58Z',
+            'version': '2.0.4',
+            'releaseTime': '2024-01-18T14:27:21Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',
diff --git a/birdhouse/components/jupyterhub/default.env b/birdhouse/components/jupyterhub/default.env
index 6b746cf2..9eb8fbd9 100644
--- a/birdhouse/components/jupyterhub/default.env
+++ b/birdhouse/components/jupyterhub/default.env
@@ -5,7 +5,7 @@
 # are applied and must be added to the list of DELAYED_EVAL.
 
 export JUPYTERHUB_DOCKER=pavics/jupyterhub
-export JUPYTERHUB_VERSION=4.0.2-20231127
+export JUPYTERHUB_VERSION=4.0.2-20240117
 
 # Jupyter single-user server images, can be overriden in env.local to have a space separated list of multiple images
 export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py39-230601-1-update231122"
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 7318b5cd..e62d2ec1 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.0.2'
+version = '2.0.4'
 # The full version, including alpha/beta/rc tags.
-release = '2.0.2'
+release = '2.0.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.