diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be654fe6fc8c0f08fa44707e1f8fd63497984f7b..d267aba5fbde59128d1775feda6c92042f35357d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -606,3 +606,31 @@ testsuite/ubuntu:18.04-x86_64-release:
   variables:
     FIXED_TAG: $CI_REGISTRY_IMAGE/testsuite-ubuntu:18.04-$FIXED_TAG_SUFFIX
     MOVING_TAG: $CI_REGISTRY_IMAGE/testsuite-ubuntu:18.04-$MOVING_TAG_SUFFIX
+
+testsuite/ubuntu:20.04-x86_64-build:
+  <<: *build-and-push
+
+  variables:
+    CONTEXT: testsuite
+    DOCKERFILE: testsuite/ubuntu-20.04.Dockerfile
+    FIXED_TAG: $CI_REGISTRY_IMAGE/testsuite-ubuntu:20.04-$FIXED_TAG_SUFFIX
+    MOVING_TAG: $CI_REGISTRY_IMAGE/testsuite-ubuntu:20.04-$MOVING_TAG_SUFFIX
+
+testsuite/ubuntu:20.04-x86_64-test:
+  <<: *test
+
+  variables:
+    FIXED_TAG: $CI_REGISTRY_IMAGE/testsuite-ubuntu:20.04-$FIXED_TAG_SUFFIX
+    TEST_TARGETS: bst-test
+
+testsuite/ubuntu:20.04-x86_64-release:
+  <<: *release
+
+  before_script:
+    # Testsuite images are released on GitLab Container Registry
+    - docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY
+    - apk add --no-cache bash make
+
+  variables:
+    FIXED_TAG: $CI_REGISTRY_IMAGE/testsuite-ubuntu:20.04-$FIXED_TAG_SUFFIX
+    MOVING_TAG: $CI_REGISTRY_IMAGE/testsuite-ubuntu:20.04-$MOVING_TAG_SUFFIX
diff --git a/templates/Dockerfile.j2 b/templates/Dockerfile.j2
index 1dcd8fad952c1cb088e3f8b3faa568f00a490571..5822bfac05d0e8b4a0309ea3e022f4055606c3d4 100644
--- a/templates/Dockerfile.j2
+++ b/templates/Dockerfile.j2
@@ -5,6 +5,9 @@ FROM {{ base_image }}
 
 ENV LANG {{ locale }}
 ENV LC_ALL {{ locale }}
+{% if env_extra is defined %}
+ENV {{ env_extra }}
+{% endif %}
 
 # install all system dependencies
 RUN \
diff --git a/templates/testsuite_images.yml b/templates/testsuite_images.yml
index dddfaaae18771c612e363a561d97cdd78ff32bac..b641af28974093a46a4627af3302fef0ed8a3ea3 100644
--- a/templates/testsuite_images.yml
+++ b/templates/testsuite_images.yml
@@ -203,6 +203,8 @@
 .debian-template: &debian
   <<: *defaults
 
+  env_extra: DEBIAN_FRONTEND=noninteractive
+
   commands: &debian-commands
     <<: *commands
 
@@ -354,6 +356,9 @@ ubuntu:18.04:
       - ostree
       - gir1.2-ostree-1.0
 
+ubuntu:20.04:
+  <<: *debian
+
 
 # Fedora based image with minimal system dependencies
 #
diff --git a/templates/variables.yml b/templates/variables.yml
index 2345bdabbb28953d203c85fdf9413900dc9f0bab..bbf60335257771d6778739ead5bec8afd326aaa3 100644
--- a/templates/variables.yml
+++ b/templates/variables.yml
@@ -67,3 +67,4 @@ TEST_IMAGES:
 
   ubuntu:
     - 18.04
+    - 20.04
diff --git a/testsuite/debian-10.Dockerfile b/testsuite/debian-10.Dockerfile
index 4a3f6fcb55ac37250ace160059c6c1f4e0e6fa9d..10a8bce316b4209bad771fdb204c1ed44620bcaf 100644
--- a/testsuite/debian-10.Dockerfile
+++ b/testsuite/debian-10.Dockerfile
@@ -14,6 +14,7 @@ FROM debian:10
 
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
+ENV DEBIAN_FRONTEND=noninteractive
 
 # install all system dependencies
 RUN \
diff --git a/testsuite/ubuntu-18.04.Dockerfile b/testsuite/ubuntu-18.04.Dockerfile
index 5969bc0257245bffac0977c5e44f206edbeab2b6..618588962c9ca1e44cb2662c33200e158b2dbaf1 100644
--- a/testsuite/ubuntu-18.04.Dockerfile
+++ b/testsuite/ubuntu-18.04.Dockerfile
@@ -14,6 +14,7 @@ FROM ubuntu:18.04
 
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
+ENV DEBIAN_FRONTEND=noninteractive
 
 # install all system dependencies
 RUN \
diff --git a/testsuite/ubuntu-20.04.Dockerfile b/testsuite/ubuntu-20.04.Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..2214e726f2d8218f78716145b3eedb930f0ca6b1
--- /dev/null
+++ b/testsuite/ubuntu-20.04.Dockerfile
@@ -0,0 +1,117 @@
+##########################################################
+##  WARNING: AUTOGENERATED FILE
+##
+## This file has been generated by `templates/render.py`.
+## Any changes made to it will be erased when the script
+## is rerun.
+##
+## If you want to update this file, please edit the
+## corresponding file in `templates` and rerun
+## `templates/render.py`
+##########################################################
+
+FROM ubuntu:20.04
+
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+ENV DEBIAN_FRONTEND=noninteractive
+
+# install all system dependencies
+RUN \
+    # Run preinstall commands (setup repositories, update caches and such)
+    apt-get update \
+    && \
+    # Install dependencies
+    apt-get install --yes --no-install-recommends \
+        # buildstream dependencies
+        bubblewrap \
+        fuse3 \
+        # plugins dependencies
+        bzr \
+        git \
+        lzip \
+        patch \
+        # external_plugins dependencies
+        quilt \
+        # ci dependencies
+        findutils \
+        make \
+        # python dependencies
+        python3 \
+        python3-dev \
+        python3-pip \
+        python3-setuptools \
+        python3-venv \
+        # build dependencies
+        libcairo2-dev \
+        libgirepository1.0-dev \
+        # buildbox-build dependencies
+        cmake \
+        libfuse3-dev \
+        libgoogle-glog-dev \
+        libgrpc++-dev \
+        libprotobuf-dev \
+        libssl-dev \
+        protobuf-compiler \
+        protobuf-compiler-grpc \
+        uuid-dev \
+    && \
+    # install python dependencies
+    # Force the ARCHI to be a generic x86_64 CPU. This is needed because of
+    # PyRoaring, which compiles otherwise with '-march=native', which creates
+    # problems when the builder has more features than hosts on which the
+    # docker image is run afterwards.
+    # Related to https://gitlab.com/BuildStream/buildstream-docker-images/issues/46
+    ARCHI=x86-64 pip3 install \
+        tox \
+        wheel \
+    && \
+    # Build BuildBox
+    git clone -n https://gitlab.com/BuildGrid/buildbox/buildbox-common.git && \
+    sh -c 'cd buildbox-common && git checkout 0.0.54' && \
+    cmake -DBUILD_TESTING=OFF buildbox-common -Bbuildbox-common/build && \
+    make -C buildbox-common/build -j "$(nproc)" && \
+    make -C buildbox-common/build install && \
+    git clone -n https://gitlab.com/BuildGrid/buildbox/buildbox-casd.git && \
+    sh -c 'cd buildbox-casd && git checkout 0.0.55' && \
+    cmake -DBUILD_TESTING=OFF -DBUILD_BENCHMARK=OFF buildbox-casd -Bbuildbox-casd/build && \
+    make -C buildbox-casd/build -j "$(nproc)" && \
+    make -C buildbox-casd/build install && \
+    rm -rf buildbox-casd && \
+    git clone -n https://gitlab.com/BuildGrid/buildbox/buildbox-fuse.git && \
+    sh -c 'cd buildbox-fuse && git checkout 0.0.52' && \
+    cmake buildbox-fuse -Bbuildbox-fuse/build && \
+    make -C buildbox-fuse/build -j "$(nproc)" && \
+    make -C buildbox-fuse/build install && \
+    rm -rf buildbox-fuse && \
+    git clone -n https://gitlab.com/BuildGrid/buildbox/buildbox-run-bubblewrap.git && \
+    sh -c 'cd buildbox-run-bubblewrap && git checkout 0.0.55' && \
+    cmake -DBUILD_TESTING=OFF buildbox-run-bubblewrap -Bbuildbox-run-bubblewrap/build && \
+    make -C buildbox-run-bubblewrap/build -j "$(nproc)" && \
+    make -C buildbox-run-bubblewrap/build install && \
+    rm -rf buildbox-run-bubblewrap && \
+    ln -sv buildbox-run-bubblewrap /usr/local/bin/buildbox-run && \
+    git clone https://gitlab.com/BuildGrid/buildbox/userchroot.git && \
+    sh -c 'cd userchroot && git checkout ade30417f8895ec59fe470c07fd76576d4869236' && \
+    cmake userchroot -Buserchroot/build && \
+    make -C userchroot/build -j "$(nproc)" && \
+    make -C userchroot/build install && \
+    chmod 4755 /usr/local/bin/userchroot && \
+    rm -rf userchroot && \
+    git clone https://gitlab.com/BuildGrid/buildbox/buildbox-run-userchroot.git && \
+    sh -c 'cd buildbox-run-userchroot && git checkout 0.0.51' && \
+    cmake -DBUILD_TESTING=OFF buildbox-run-userchroot -Bbuildbox-run-userchroot/build && \
+    make -C buildbox-run-userchroot/build -j "$(nproc)" && \
+    make -C buildbox-run-userchroot/build install && \
+    rm -rf buildbox-run-userchroot && \
+    xargs rm -f < buildbox-common/build/install_manifest.txt && \
+    rm -rf buildbox-common && \
+    # User setup
+    useradd -Um testuser && \
+    # Cleanup afterwards
+    apt-get autoremove --yes cmake protobuf-compiler protobuf-compiler-grpc && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists
+
+USER testuser
+WORKDIR /home/testuser