diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 474ddff..f005f67 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,9 +2,8 @@ stages:
     - build
     - test
 
-build:buster:
+.build:
     stage: build
-    image: debian:buster
     before_script:
         - apt-get update && apt-get install -y build-essential exim4-dev libsodium-dev
     script:
@@ -15,35 +14,53 @@ build:buster:
             - src/genkey
             - src/libexim-encrypt-dlfunc.so
 
+build:buster:
+    extends:
+        - .build
+    image: debian:buster
+
 build:bullseye:
-    stage: build
     image: debian:bullseye
+    extends:
+        - .build
+
+build:bionic:
+    image: ubuntu:bionic
+    extends:
+        - .build
+
+build:focal:
+    image: ubuntu:focal
+    extends:
+        - .build
+.test:
+    stage: test
     before_script:
-        - apt-get update && apt-get install -y build-essential exim4-dev libsodium-dev
+        - apt-get update && apt-get install -y exim4-daemon-heavy openssl libsodium23
     script:
         - cd src
-        - make all
-    artifacts:
-        paths:
-            - src/genkey
-            - src/libexim-encrypt-dlfunc.so
+        - ./simple_exim_test.sh
 
 test:buster:
-    stage: test
+    extends:
+        - .test
     needs: ["build:buster"]
     image: debian:buster
-    before_script:
-        - apt-get update && apt-get install -y exim4-daemon-heavy openssl libsodium
-    script:
-        - cd src
-        - ./simple_exim_test.sh
 
 test:bullseye:
-    stage: test
+    extends:
+        - .test
     needs: ["build:bullseye"]
     image: debian:bullseye
-    before_script:
-        - apt-get update && apt-get install -y exim4-daemon-heavy openssl libsodium
-    script:
-        - cd src
-        - ./simple_exim_test.sh
+
+test:bionic:
+    extends:
+        - .test
+    needs: ["build:bionic"]
+    image: ubuntu:bionic
+
+test:focal:
+    extends:
+        - .test
+    needs: ["build:focal"]
+    image: ubuntu:focal