diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 539b1643bc1422719a3cace091ffbb3bd0d6753e..141b4409fd41da08e8edbfbd414a4eca77a618f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,3 +44,32 @@ go-latest-bullseye:
         - make test
     tags:
         - shared runner
+
+buster:
+  image: debian:buster
+  before_script:
+    - export PGHOST=postgres PGUSER=$POSTGRES_USER PGPASSWORD=$POSTGRES_PASSWORD PGSSLMODE=disable
+    - export DB_URL="host=postgres user=$POSTGRES_USER password=$POSTGRES_PASSWORD sslmode=disable"
+    - apt update -qq
+    - apt upgrade --yes
+    - apt install --yes golang build-essential ca-certificates git libpam0g-dev libgnutls28-dev libpam-wrapper pamtester oathtool postgresql xxd
+    - go get -d
+  script:
+        - make test
+  tags:
+        - shared runner
+
+bullseye:
+  image: debian:bullseye
+  before_script:
+    - export PGHOST=postgres PGUSER=$POSTGRES_USER PGPASSWORD=$POSTGRES_PASSWORD PGSSLMODE=disable
+    - export DB_URL="host=postgres user=$POSTGRES_USER password=$POSTGRES_PASSWORD sslmode=disable"
+    - apt update -qq
+    - apt upgrade --yes
+    # The bullseye container does not have pkill installed -> procps
+    - apt install --yes golang build-essential ca-certificates git libpam0g-dev libgnutls28-dev libpam-wrapper pamtester oathtool postgresql xxd procps
+    - go get -d
+  script:
+    - make test
+  tags:
+    - shared runner