diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aeceb6e0..35c69e01 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,30 +1,46 @@
-image: debian:buster-backports
-
 stages:
   - test
   - quality-assurance
 
-before_script:
-  # We do not include uwsgi and LaTeX here
-  - >
-      apt-get update &&
-      apt-get install -t buster-backports -y python3-django python3-django-crispy-forms
-      python3-django-extensions python3-django-filters python3-django-polymorphic
-      python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil
-      python3-babel python3-lockfile python3-pip python3-phonenumbers ipython3
-      gettext libjs-bootstrap4 fonts-font-awesome tox &&
-      rm -rf /var/lib/apt/lists/*
-
+# Debian Buster
 py37-django22:
   stage: test
-  script: tox -e py37-django22
+  image: debian:buster-backports
+  before_script: >
+    apt-get update &&
+    apt-get install -t buster-backports -y python3-django python3-django-crispy-forms
+    python3-django-extensions python3-django-filters python3-django-polymorphic
+    python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil
+    python3-babel python3-lockfile python3-pip python3-phonenumbers ipython3
+    gettext libjs-bootstrap4 fonts-font-awesome tox &&
+    rm -rf /var/lib/apt/lists/*
+ script: tox -e py37-django22
 
+# Ubuntu 20.04
 py38-django22:
   stage: test
-  script: tox -e py38-django22
+  image: ubuntu:20.04
+  before_script: >
+    apt-get update &&
+    apt-get install -y python3-django python3-django-crispy-forms
+    python3-django-extensions python3-django-filters python3-django-polymorphic
+    python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil
+    python3-babel python3-lockfile python3-pip python3-phonenumbers ipython3
+    gettext libjs-bootstrap4 fonts-font-awesome tox &&
+    rm -rf /var/lib/apt/lists/*
+ script: tox -e py38-django22
 
 linters:
   stage: quality-assurance
+  image: debian:buster-backports
+  before_script: >
+    apt-get update &&
+    apt-get install -t buster-backports -y python3-django python3-django-crispy-forms
+    python3-django-extensions python3-django-filters python3-django-polymorphic
+    python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil
+    python3-babel python3-lockfile python3-pip python3-phonenumbers ipython3
+    gettext libjs-bootstrap4 fonts-font-awesome tox &&
+    rm -rf /var/lib/apt/lists/*
   script: tox -e linters
 
   # Be nice to new contributors, but please use `tox`