diff --git a/Dockerfile b/Dockerfile
index c336b6d0..283a6eb5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,19 +5,22 @@ FROM python:3.12
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
+SHELL ["/bin/bash", "-c"]
+
 # Set work directory
 WORKDIR /app
 
 # Install dependencies
 COPY requirements.txt /app/
 
-RUN apt-get update && apt-get -y upgrade
-RUN apt-get install libmagic1 -y
-RUN apt-get install -y gettext
-
-# Install dependencies
-RUN pip install --upgrade pip
-RUN pip install -r requirements.txt
+RUN <<EOF
+  set -exo pipefail
+  apt-get update
+  apt-get -y upgrade
+  apt-get install -y --no-install-recommends libmagic1 gettext
+  pip install --upgrade pip
+  pip install -r requirements.txt
+EOF
 
 # Copy project
 COPY ./app /app/
diff --git a/Dockerfile-dev b/Dockerfile-dev
index 09a86258..465abf5d 100644
--- a/Dockerfile-dev
+++ b/Dockerfile-dev
@@ -6,21 +6,22 @@ FROM python:3.12
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
+SHELL ["/bin/bash", "-c"]
+
 # Set work directory
 WORKDIR /app
 
 # Install dependencies
-COPY requirements.txt /app/
-COPY requirements-dev.txt /app/
-
-RUN apt-get update && apt-get -y upgrade
-RUN apt-get install libmagic1 -y
-RUN apt-get install --no-install-recommends -y graphviz graphviz-dev
-RUN apt-get install -y gettext
+COPY requirements.txt requirements-dev.txt /app/
 
-# Install dependencies
-RUN pip install --upgrade pip
-RUN pip install -r requirements-dev.txt
+RUN <<EOF
+  set -exo pipefail
+  apt-get update
+  apt-get -y upgrade
+  apt-get install -y --no-install-recommends libmagic1 gettext graphviz graphviz-dev
+  pip install --upgrade pip
+  pip install -r requirements-dev.txt
+EOF
 
 # Copy project
 COPY ./app /app/
diff --git a/app/app/settings.py b/app/app/settings.py
index 88064c6b..af92a265 100644
--- a/app/app/settings.py
+++ b/app/app/settings.py
@@ -109,6 +109,8 @@
         "USER": os.environ.get("DB_USER"),
         "PASSWORD": os.environ.get("DB_PASSWORD"),
         "TEST": {"NAME": "test_db"},
+        "CONN_MAX_AGE": None,
+        "CONN_HEALTH_CHECKS": True,
     }
 }
 
diff --git a/app/gunicorn.conf.py b/app/gunicorn.conf.py
new file mode 100644
index 00000000..2aa9408e
--- /dev/null
+++ b/app/gunicorn.conf.py
@@ -0,0 +1,12 @@
+# Send output from the web app to the error log:
+capture_output = True
+errorlog = "-"
+
+keepalive = 30
+max_requests = 1000000
+max_requests_jitter = 1000
+graceful_timeout = 5
+preload_app = True
+
+workers = 4
+threads = 3
diff --git a/entrypoint.sh b/entrypoint.sh
index 58051188..11ebf19f 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -9,4 +9,4 @@ python manage.py migrate --no-input
 python manage.py collectstatic --no-input
 python manage.py compilemessages
 
-gunicorn app.wsgi:application --bind 0.0.0.0:8000
+gunicorn app.wsgi:application --bind 0.0.0.0:8000 --config gunicorn.conf.py
diff --git a/requirements.txt b/requirements.txt
index e89d4c52..f6d8f0c2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-django==5.0.2
+django==5.0.6
 django-environ
 django-simple-history
 gunicorn