diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2b14b9a..de9409ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,140 +31,140 @@ stages:
   # That's Docker in Docker
   - dind
 
-# docker_debian-7-amd64:
-#   variables:
-#     IMG_NAME: "debian-7-amd64"
-#   <<: *docker_build
+docker_debian-7-amd64:
+  variables:
+    IMG_NAME: "debian-7-amd64"
+  <<: *docker_build
 
-# docker_debian-8-amd64:
-#   variables:
-#     IMG_NAME: "debian-8-amd64"
-#   <<: *docker_build
+docker_debian-8-amd64:
+  variables:
+    IMG_NAME: "debian-8-amd64"
+  <<: *docker_build
 
-# docker_debian-9-amd64:
-#   variables:
-#     IMG_NAME: "debian-9-amd64"
-#   <<: *docker_build
+docker_debian-9-amd64:
+  variables:
+    IMG_NAME: "debian-9-amd64"
+  <<: *docker_build
 
-# docker_debian-10-amd64:
-#   variables:
-#     IMG_NAME: "debian-10-amd64"
-#   <<: *docker_build
+docker_debian-10-amd64:
+  variables:
+    IMG_NAME: "debian-10-amd64"
+  <<: *docker_build
 
-# docker_debian-testing-amd64:
-#   variables:
-#     IMG_NAME: "debian-testing-amd64"
-#   <<: *docker_build
+docker_debian-testing-amd64:
+  variables:
+    IMG_NAME: "debian-testing-amd64"
+  <<: *docker_build
 
-# docker_debian-7-i386:
-#   variables:
-#     IMG_NAME: "debian-7-i386"
-#   <<: *docker_build
+docker_debian-7-i386:
+  variables:
+    IMG_NAME: "debian-7-i386"
+  <<: *docker_build
 
-# docker_debian-8-i386:
-#   variables:
-#     IMG_NAME: "debian-8-i386"
-#   <<: *docker_build
+docker_debian-8-i386:
+  variables:
+    IMG_NAME: "debian-8-i386"
+  <<: *docker_build
 
-# docker_debian-9-i386:
-#   variables:
-#     IMG_NAME: "debian-9-i386"
-#   <<: *docker_build
+docker_debian-9-i386:
+  variables:
+    IMG_NAME: "debian-9-i386"
+  <<: *docker_build
 
-# docker_debian-10-i386:
-#   variables:
-#     IMG_NAME: "debian-10-i386"
-#   <<: *docker_build
+docker_debian-10-i386:
+  variables:
+    IMG_NAME: "debian-10-i386"
+  <<: *docker_build
 
-# docker_debian-testing-i386:
-#   variables:
-#     IMG_NAME: "debian-testing-i386"
-#   <<: *docker_build
+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-25-amd64:
+  variables:
+    IMG_NAME: "fedora-25-amd64"
+  <<: *docker_build
 
-# docker_fedora-26-amd64:
-#   variables:
-#     IMG_NAME: "fedora-26-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-27-amd64:
+  variables:
+    IMG_NAME: "fedora-27-amd64"
+  <<: *docker_build
 
-# docker_fedora-28-amd64:
-#   variables:
-#     IMG_NAME: "fedora-28-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-29-amd64:
+  variables:
+    IMG_NAME: "fedora-29-amd64"
+  <<: *docker_build
 
-# docker_fedora-30-amd64:
-#   variables:
-#     IMG_NAME: "fedora-30-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_centos-7-amd64:
-#   variables:
-#     IMG_NAME: "centos-7-amd64"
-#   <<: *docker_build
+docker_centos-7-amd64:
+  variables:
+    IMG_NAME: "centos-7-amd64"
+  <<: *docker_build
 
-# docker_centos-8-amd64:
-#   variables:
-#     IMG_NAME: "centos-8-amd64"
-#   <<: *docker_build
+docker_centos-8-amd64:
+  variables:
+    IMG_NAME: "centos-8-amd64"
+  <<: *docker_build
 
-# docker_opensuse-42_3-amd64:
-#   variables:
-#     IMG_NAME: "opensuse-42.3-amd64"
-#   <<: *docker_build
+docker_opensuse-42_3-amd64:
+  variables:
+    IMG_NAME: "opensuse-42.3-amd64"
+  <<: *docker_build
 
-# docker_ubuntu-14_04-amd64:
-#   variables:
-#     IMG_NAME: "ubuntu-14.04-amd64"
-#   <<: *docker_build
+docker_ubuntu-14_04-amd64:
+  variables:
+    IMG_NAME: "ubuntu-14.04-amd64"
+  <<: *docker_build
  
-# docker_ubuntu-16_04-amd64:
-#   variables:
-#     IMG_NAME: "ubuntu-16.04-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-18_04-amd64:
+  variables:
+    IMG_NAME: "ubuntu-18.04-amd64"
+  <<: *docker_build
  
-# docker_ubuntu-19_04-amd64:
-#   variables:
-#     IMG_NAME: "ubuntu-19.04-amd64"
-#   <<: *docker_build
+docker_ubuntu-19_04-amd64:
+  variables:
+    IMG_NAME: "ubuntu-19.04-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
+.freebsd-11-i386: &freebsd-11-i386_env
+  tags:
+  - freebsd
+  - i386
   #only:
   #- master
   #- triggers
   #- tags
 
-# .freebsd-11-amd64: &freebsd-11-amd64_env
-#   tags:
-#   - freebsd
-#   - amd64
+.freebsd-11-amd64: &freebsd-11-amd64_env
+  tags:
+  - freebsd
+  - amd64
 
 .build: &build-base
   stage: build
@@ -194,146 +194,141 @@ docker_fedora-31-amd64:
     - linux
     - amd64
 
-# build-debian-7-amd64:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:debian-7-amd64
+build-debian-7-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:debian-7-amd64
 
-# build-debian-7-i386:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:debian-7-i386
+build-debian-7-i386:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:debian-7-i386
 
-# build-debian-8-amd64:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:debian-8-amd64
+build-debian-8-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:debian-8-amd64
 
-# build-debian-8-i386:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:debian-8-i386
+build-debian-8-i386:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:debian-8-i386
 
-# build-debian-9-amd64:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:debian-9-amd64
+build-debian-9-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:debian-9-amd64
 
-# build-debian-9-i386:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:debian-9-i386
+build-debian-9-i386:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:debian-9-i386
 
-# build-debian-10-amd64:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:debian-10-amd64
+build-debian-10-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:debian-10-amd64
 
-# build-debian-10-i386:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:debian-10-i386
+build-debian-10-i386:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:debian-10-i386
 
-# build-debian-testing-amd64:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:debian-testing-amd64
+build-debian-testing-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:debian-testing-amd64
 
-# build-debian-testing-i386:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:debian-testing-i386
+build-debian-testing-i386:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:debian-testing-i386
 
-# build-fedora-25-amd64:
-#   <<: *preprocessing-fedora
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:fedora-25-amd64
+build-fedora-25-amd64:
+  <<: [*preprocessing-fedora, *build-linux]
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:fedora-25-amd64
 
-# build-fedora-26-amd64:
-#   <<: *preprocessing-fedora
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:fedora-26-amd64
+build-fedora-26-amd64:
+  <<: [*preprocessing-fedora, *build-linux]
+  image: registry.labs.nic.cz/labs/bird:fedora-26-amd64
 
-# build-fedora-27-amd64:
-#   <<: *preprocessing-fedora
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:fedora-27-amd64
+build-fedora-27-amd64:
+  <<: [*preprocessing-fedora, *build-linux]
+  image: registry.labs.nic.cz/labs/bird:fedora-27-amd64
 
-# build-fedora-28-amd64:
-#   <<: *preprocessing-fedora
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:fedora-28-amd64
+build-fedora-28-amd64:
+  <<: [*preprocessing-fedora, *build-linux]
+  image: registry.labs.nic.cz/labs/bird:fedora-28-amd64
 
-# build-fedora-29-amd64:
-#   <<: *preprocessing-fedora
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:fedora-29-amd64
+build-fedora-29-amd64:
+  <<: [*preprocessing-fedora, *build-linux]
+  image: registry.labs.nic.cz/labs/bird:fedora-29-amd64
 
-# build-fedora-30-amd64:
-#   <<: *preprocessing-fedora
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:fedora-30-amd64
+build-fedora-30-amd64:
+  <<: [*preprocessing-fedora, *build-linux]
+  image: registry.labs.nic.cz/labs/bird:fedora-30-amd64
 
 build-fedora-31-amd64:
   <<: [*preprocessing-fedora, *build-linux]
   image: registry.labs.nic.cz/labs/bird:fedora-31-amd64
 
-# build-centos-7-amd64:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:centos-7-amd64
+build-centos-7-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:centos-7-amd64
 
-# build-centos-8-amd64:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:centos-8-amd64
+build-centos-8-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:centos-8-amd64
 
-# build-opensuse-42_3-amd64:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:opensuse-42.3-amd64
+build-opensuse-42_3-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:opensuse-42.3-amd64
 
-# build-ubuntu-14_04-amd64:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:ubuntu-14.04-amd64
+build-ubuntu-14_04-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:ubuntu-14.04-amd64
 
-# build-ubuntu-16_04-amd64:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:ubuntu-16.04-amd64
+build-ubuntu-16_04-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:ubuntu-16.04-amd64
 
-# build-ubuntu-18_04-amd64:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:ubuntu-18.04-amd64
+build-ubuntu-18_04-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:ubuntu-18.04-amd64
 
-# build-ubuntu-19_04-amd64:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:ubuntu-19.04-amd64
+build-ubuntu-19_04-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:ubuntu-19.04-amd64
 
-# build-freebsd-11-amd64:
-#   <<: *build-base
-#   tags:
-#     - freebsd
-#     - amd64
+build-freebsd-11-amd64:
+  <<: *build-base
+  tags:
+    - freebsd
+    - amd64
 
-# build-freebsd-11-i386:
-#   <<: *build-base
-#   tags:
-#     - freebsd
-#     - i386
+build-freebsd-11-i386:
+  <<: *build-base
+  tags:
+    - freebsd
+    - i386
 
-# build-birdlab:
-#   stage: build
-#   tags:
-#     - birdlab
-#     - amd64
-#   script:
-#     - DIR=$(pwd)
-#     - autoreconf
-#     - ./configure
-#     - make
-#     - cd $TOOLS_DIR
-#     - sudo git clean -fx
-#     - git pull --ff-only
-#     - mv $DIR/bird $DIR/birdc netlab/common
+build-birdlab:
+  stage: build
+  tags:
+    - birdlab
+    - amd64
+  script:
+    - DIR=$(pwd)
+    - autoreconf
+    - ./configure
+    - make
+    - cd $TOOLS_DIR
+    - sudo git clean -fx
+    - git pull --ff-only
+    - mv $DIR/bird $DIR/birdc netlab/common
 
-# .test: &test-base
-#   stage: test
-#   needs: [build-birdlab]
-#   tags:
-#     - birdlab
-#     - amd64
-#   script:
-#     - cd $TOOLS_DIR/netlab
-#     - sudo ./runtest -m check $TEST_NAME
+.test: &test-base
+  stage: test
+  needs: [build-birdlab]
+  tags:
+    - birdlab
+    - amd64
+  script:
+    - cd $TOOLS_DIR/netlab
+    - sudo ./runtest -m check $TEST_NAME
 
-# test-ospf:
-#   <<: *test-base
-#   variables:
-#     TEST_NAME: cf-ospf
+test-ospf:
+  <<: *test-base
+  variables:
+    TEST_NAME: cf-ospf