diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cdbb0eaf..e767d5c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,55 +31,55 @@ 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:
@@ -106,10 +106,10 @@ docker_debian-testing-i386:
 #     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:
@@ -154,6 +154,7 @@ docker_debian-testing-i386:
 .build: &build-base
   stage: build
   script:
+  - dnf -y install make
   - autoreconf
   - ./configure CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
   # Detect which make is available
@@ -170,45 +171,45 @@ docker_debian-testing-i386:
     - 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:
 #   <<: *build-linux
@@ -230,9 +231,9 @@ build-debian-testing-i386:
 #   <<: *build-linux
 #   image: registry.labs.nic.cz/labs/bird:fedora-29-amd64
 
-# build-fedora-30-amd64:
-#   <<: *build-linux
-#   image: registry.labs.nic.cz/labs/bird:fedora-30-amd64
+build-fedora-30-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:fedora-30-amd64
 
 # build-fedora-31-amd64:
 #   <<: *build-linux