diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02d0a66a9ab203ed8521a7983d86a1f756022409..1c8aa8692671774b36f70c49ec743e315b0b6d7f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ variables:
   STAYRTR_BINARY: /var/lib/gitlab-runner/stayrtr-0.1-108-g8d18a41-linux-x86_64
 
 stages:
-  - image
+#  - image
   - build
   - pkg
   - test
@@ -33,175 +33,12 @@ stages:
   # That's Docker in Docker
   - dind
 
-docker_debian-8-amd64:
-  variables:
-    IMG_NAME: "debian-8-amd64"
-  <<: *docker_build
-
-docker_debian-8-i386:
-  variables:
-    IMG_NAME: "debian-8-i386"
-  <<: *docker_build
-
-docker_debian-9-amd64:
-  variables:
-    IMG_NAME: "debian-9-amd64"
-  <<: *docker_build
-
-docker_debian-9-i386:
-  variables:
-    IMG_NAME: "debian-9-i386"
-  <<: *docker_build
-
-docker_debian-10-amd64:
-  variables:
-    IMG_NAME: "debian-10-amd64"
-  <<: *docker_build
-
-docker_debian-10-i386:
-  variables:
-    IMG_NAME: "debian-10-i386"
-  <<: *docker_build
-
-docker_debian-11-amd64:
-  variables:
-    IMG_NAME: "debian-11-amd64"
-  <<: *docker_build
-
-# GPG error
-#docker_debian-11-i386:
+# Docker build example
+#docker_debian-11-amd64:
 #  variables:
-#    IMG_NAME: "debian-11-i386"
+#    IMG_NAME: "debian-11-amd64"
 #  <<: *docker_build
 
-docker_debian-testing-amd64:
-  variables:
-    IMG_NAME: "debian-testing-amd64"
-  <<: *docker_build
-
-# GPG error
-#docker_debian-testing-i386:
-#  variables:
-#    IMG_NAME: "debian-testing-i386"
-#  <<: *docker_build
-
-docker_fedora-25-amd64:
-  variables:
-    IMG_NAME: "fedora-25-amd64"
-  <<: *docker_build
-
-docker_fedora-26-amd64:
-  variables:
-    IMG_NAME: "fedora-26-amd64"
-  <<: *docker_build
-
-docker_fedora-27-amd64:
-  variables:
-    IMG_NAME: "fedora-27-amd64"
-  <<: *docker_build
-
-docker_fedora-28-amd64:
-  variables:
-    IMG_NAME: "fedora-28-amd64"
-  <<: *docker_build
-
-docker_fedora-29-amd64:
-  variables:
-    IMG_NAME: "fedora-29-amd64"
-  <<: *docker_build
-
-docker_fedora-30-amd64:
-  variables:
-    IMG_NAME: "fedora-30-amd64"
-  <<: *docker_build
-
-docker_fedora-31-amd64:
-  variables:
-    IMG_NAME: "fedora-31-amd64"
-  <<: *docker_build
-
-docker_fedora-32-amd64:
-  variables:
-    IMG_NAME: "fedora-32-amd64"
-  <<: *docker_build
-
-docker_fedora-33-amd64:
-  variables:
-    IMG_NAME: "fedora-33-amd64"
-  <<: *docker_build
-
-docker_fedora-34-amd64:
-  variables:
-    IMG_NAME: "fedora-34-amd64"
-  <<: *docker_build
-
-docker_centos-8-amd64:
-  variables:
-    IMG_NAME: "centos-8-amd64"
-  <<: *docker_build
-
-docker_ubuntu-16_04-amd64:
-  variables:
-    IMG_NAME: "ubuntu-16.04-amd64"
-  <<: *docker_build
-
-docker_ubuntu-18_04-amd64:
-  variables:
-    IMG_NAME: "ubuntu-18.04-amd64"
-  <<: *docker_build
-
-docker_ubuntu-20_04-amd64:
-  variables:
-    IMG_NAME: "ubuntu-20.04-amd64"
-  <<: *docker_build
-
-docker_ubuntu-21_10-amd64:
-  variables:
-    IMG_NAME: "ubuntu-21.10-amd64"
-  <<: *docker_build
-
-# GPG error
-#docker_ubuntu-21_04-amd64:
-#  variables:
-#    IMG_NAME: "ubuntu-21.04-amd64"
-#  <<: *docker_build
-
-docker_opensuse-15.0-amd64:
-  variables:
-    IMG_NAME: "opensuse-15.0-amd64"
-  <<: *docker_build
-
-docker_opensuse-15.1-amd64:
-  variables:
-    IMG_NAME: "opensuse-15.1-amd64"
-  <<: *docker_build
-
-docker_opensuse-15.2-amd64:
-  variables:
-    IMG_NAME: "opensuse-15.2-amd64"
-  <<: *docker_build
-
-docker_opensuse-15.3-amd64:
-  variables:
-    IMG_NAME: "opensuse-15.3-amd64"
-  <<: *docker_build
-
-# TODO We want to copy these BSDs to our own virtual machines, to make sure
-# someone doesn't update them by accident.
-.freebsd-11-i386: &freebsd-11-i386_env
-  tags:
-  - freebsd
-  - i386
-  #only:
-  #- master
-  #- triggers
-  #- tags
-
-.freebsd-11-amd64: &freebsd-11-amd64_env
-  tags:
-  - freebsd
-  - amd64
-
 
 .build: &build-base
   stage: build
@@ -399,13 +236,11 @@ build-opensuse-15.3-amd64:
 #  needs: [build-debian-8-i386]
 #  image: registry.nic.cz/labs/bird:debian-8-i386
 
-# Dpkg error: PATH is not set
 pkg-debian-9-amd64:
   <<: *pkg-deb
   needs: [build-debian-9-amd64]
   image: registry.nic.cz/labs/bird:debian-9-amd64
 
-# Dpkg error: PATH is not set
 pkg-debian-9-i386:
   <<: *pkg-deb
   needs: [build-debian-9-i386]
@@ -659,3 +494,44 @@ test-kernel-learn:
   <<: *test-base
   variables:
     TEST_NAME: cf-kernel-learn
+
+
+.build-birdlab-base: &build-birdlab-base
+  stage: build
+  script:
+    - autoreconf
+    - ./configure
+    - gmake
+    - gmake check
+
+build-birdlab-debian-11:
+  <<: *build-birdlab-base
+  tags:
+    - birdlab-debian-11
+    - amd64
+
+build-birdlab-centos-08:
+  <<: *build-birdlab-base
+  tags:
+    - birdlab-centos-08
+    - amd64
+
+build-birdlab-fedora-37:
+  <<: *build-birdlab-base
+  tags:
+    - birdlab-fedora-37
+    - amd64
+
+build-birdlab-freebsd-13:
+  <<: *build-birdlab-base
+  tags:
+    - birdlab-freebsd-13
+    - amd64
+
+build-birdlab-openbsd-71:
+  <<: *build-birdlab-base
+  variables:
+     AUTOCONF_VERSION: "2.71"
+  tags:
+    - birdlab-openbsd-71
+    - amd64