diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4657948aab..21d19954db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -148,8 +148,8 @@ stages:
 
 # Ubuntu
 
-.ubuntu-xenial-amd64: &ubuntu_xenial_amd64_image
-  image: "$CI_REGISTRY_IMAGE:ubuntu-xenial-amd64"
+.ubuntu-bionic-amd64: &ubuntu_bionic_amd64_image
+  image: "$CI_REGISTRY_IMAGE:ubuntu-bionic-amd64"
   <<: *linux_amd64
 
 .ubuntu-focal-amd64: &ubuntu_focal_amd64_image
@@ -891,28 +891,28 @@ unit:gcc:fedora33:amd64:
     - job: gcc:fedora33:amd64
       artifacts: true
 
-# Jobs for regular GCC builds on Ubuntu 16.04 Xenial Xerus (amd64)
+# Jobs for regular GCC builds on Ubuntu 18.04 Bionic Beaver (amd64)
 
-gcc:xenial:amd64:
+gcc:bionic:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O2"
     EXTRA_CONFIGURE: "--without-geoip2 --with-geoip --disable-dnstap"
-  <<: *ubuntu_xenial_amd64_image
+  <<: *ubuntu_bionic_amd64_image
   <<: *build_job
 
-system:gcc:xenial:amd64:
-  <<: *ubuntu_xenial_amd64_image
+system:gcc:bionic:amd64:
+  <<: *ubuntu_bionic_amd64_image
   <<: *system_test_job
   needs:
-    - job: gcc:xenial:amd64
+    - job: gcc:bionic:amd64
       artifacts: true
 
-unit:gcc:xenial:amd64:
-  <<: *ubuntu_xenial_amd64_image
+unit:gcc:bionic:amd64:
+  <<: *ubuntu_bionic_amd64_image
   <<: *unit_test_job
   needs:
-    - job: gcc:xenial:amd64
+    - job: gcc:bionic:amd64
       artifacts: true
 
 # Jobs for regular GCC builds on Ubuntu 20.04 Focal Fossa (amd64)