diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 91b02613b4222a92797233511804386551aee700..84c180b8171dfa15dcd636410b082aea074c2632 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,25 @@ build-debian-buster:
         - ./build.sh mp-dragonlab
         - cp *.deb build-buster
 
+build-ubuntu-focal:
+    stage: build
+    image: ubuntu:focal
+    artifacts:
+        expire_in: 1d
+        paths:
+            - build-focal
+    script:
+        - apt-get update && apt-get upgrade -y
+        - DEBIAN_FRONTEND=noninteractive apt-get install -y debhelper git curl apt-utils locales
+        - mkdir build-focal
+        - echo "Building for MP-UNINETT"
+        - ./build.sh mp-uninett
+        - cp *.deb build-focal
+
+        - echo "Building for MP-DRAGONLAB"
+        - ./build.sh mp-dragonlab
+        - cp *.deb build-focal
+
 deploy-apt:
     stage: deploy
     image: debian:buster
@@ -28,6 +47,7 @@ deploy-apt:
     artifacts:
         paths:
             - build-buster
+            - build-focal
     script:
         - apt-get update && apt-get install openssh-client -y
         - (
@@ -38,4 +58,5 @@ deploy-apt:
           )
         - ls -l build-*/*.deb
         - scp build-buster/*.deb jenkins@apt.uninett.no:/www/apt.uninett.no/htdocs/debian/pool/buster/main/all/
+        - scp build-focal/*.deb jenkins@apt.uninett.no:/www/apt.uninett.no/htdocs/ubuntu/pool/focal/main/all/
         - ssh jenkins@apt.uninett.no /www/apt.uninett.no/bin/mkrepo