diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 099003f541..787605aca7 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -4,5 +4,5 @@
 - [ ] PR only involves cherry-picked commits from upstream.
 - [ ] PR contains custom code which will soon be available in an upstream release and can be overriden => mention core-geonetwork version if possible.
 - [ ] PR contains custom geOrchestra code, which need to be verified during future migrations.
-  -  [ ] I have properly filled the [migration-helper-changelog.md](..%2Fgeorchestra-migration%2Fmigration-helper-changelog.md) file.
+  -  [ ] I have properly filled the [migration-helper-changelog.md](../georchestra-migration/migration-helper-changelog.md) file.
 
diff --git a/web/src/docker/Dockerfile b/web/src/docker/Dockerfile
index 4c4c5392de..f041983d2d 100644
--- a/web/src/docker/Dockerfile
+++ b/web/src/docker/Dockerfile
@@ -14,6 +14,9 @@ RUN chown jetty:jetty /docker-entrypoint.d
 RUN mkdir -p /mnt/geonetwork_datadir && \
     chown jetty:jetty /mnt/geonetwork_datadir
 
+# Removes extra javax.mail library provided by Jetty
+RUN rm -rf /usr/local/jetty/lib/mail
+
 # Restore jetty user
 USER jetty