diff --git a/Dockerfile b/Dockerfile
index 03e9559e07601145e5303f3443d1bc9db05ca5d5..994203fb1bc8f91a359c936fc61f81fd49724091 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM ruby:2.5.3
-MAINTAINER web-services-core <web-services-core@cern.ch>
+LABEL maintainer="web-services-core <web-services-core@cern.ch>"
 
 ### Install prerequisites #############################
 RUN apt update && \
@@ -29,7 +29,7 @@ RUN apt update && \
 
 ### Set up Discourse ##################################
 #   - So we can overrride it with --build_arg
-ARG DISCOURSE_VERS='v2.1.4'
+ARG DISCOURSE_VERS='v2.1.5'
 ENV DISCOURSE_RELEASE=$DISCOURSE_VERS RAILS_ENV=production RAILS_ROOT=/discourse HOME=/discourse
 
 RUN mkdir -p discourse && \
diff --git a/templates/discourse-cern.yaml b/templates/discourse-cern.yaml
index 12a597d9fbd8a6cb1665e6c901e463ccc07d6f03..0462c9cec493c137ccb7c232fd2e63aaa769533f 100644
--- a/templates/discourse-cern.yaml
+++ b/templates/discourse-cern.yaml
@@ -512,7 +512,7 @@ objects:
   data:
     discourse.conf: |2
       # connection pool size, sidekiq is set to 1, allowing an extra 3 for bg threads
-      db_pool = 4
+      db_pool = 2
 
       # database timeout in milliseconds
       db_timeout = 5000