diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 252ed8a5b..5b085c36c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ variables:
   stage: build
   before_script:
    - apt-get update
-   - apt-get -y install build-essential git cmake libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libleveldb-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev
+   - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential git cmake libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libleveldb-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev
   script:
     - git clone https://github.com/minetest/irrlicht -b $IRRLICHT_TAG lib/irrlichtmt
     - mkdir cmakebuild
@@ -134,28 +134,6 @@ deploy:debian-11:
 ## Ubuntu
 ##
 
-# Xenial
-
-build:ubuntu-16.04:
-  extends: .build_template
-  image: ubuntu:xenial
-
-package:ubuntu-16.04:
-  extends: .debpkg_template
-  image: ubuntu:xenial
-  needs:
-    - build:ubuntu-16.04
-  variables:
-    JSONCPP_PKG: libjsoncpp1
-    LEVELDB_PKG: libleveldb1v5
-    JPEG_PKG: libjpeg-turbo8
-
-deploy:ubuntu-16.04:
-  extends: .debpkg_install
-  image: ubuntu:xenial
-  needs:
-    - package:ubuntu-16.04
-
 # Bionic
 
 build:ubuntu-18.04:
@@ -178,6 +156,28 @@ deploy:ubuntu-18.04:
   needs:
     - package:ubuntu-18.04
 
+# Focal
+
+build:ubuntu-20.04:
+  extends: .build_template
+  image: ubuntu:focal
+
+package:ubuntu-20.04:
+  extends: .debpkg_template
+  image: ubuntu:focal
+  needs:
+    - build:ubuntu-20.04
+  variables:
+    JSONCPP_PKG: libjsoncpp1
+    LEVELDB_PKG: libleveldb1d
+    JPEG_PKG: libjpeg-turbo8
+
+deploy:ubuntu-20.04:
+  extends: .debpkg_install
+  image: ubuntu:focal
+  needs:
+    - package:ubuntu-20.04
+
 ##
 ## Fedora
 ##