diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad4544af..05dbb64f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,6 +71,11 @@ docker_debian-9-i386:
     IMG_NAME: "debian-9-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"
@@ -86,6 +91,31 @@ docker_fedora-26-amd64:
     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_centos-7-amd64:
   variables:
     IMG_NAME: "centos-7-amd64"
@@ -153,6 +183,10 @@ 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-testing-amd64:
   <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:debian-testing-amd64
@@ -169,6 +203,26 @@ build-fedora-26-amd64:
   <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:fedora-26-amd64
 
+build-fedora-27-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:fedora-27-amd64
+
+build-fedora-28-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:fedora-28-amd64
+
+build-fedora-29-amd64:
+  <<: *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-31-amd64:
+  <<: *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
diff --git a/misc/docker/debian-10-i386/Dockerfile b/misc/docker/debian-10-i386/Dockerfile
new file mode 100644
index 00000000..73e70750
--- /dev/null
+++ b/misc/docker/debian-10-i386/Dockerfile
@@ -0,0 +1,12 @@
+FROM i386/debian:stretch-slim
+ENV DEBIAN_FRONTEND noninteractive
+RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
+RUN apt-get -y update
+RUN apt-get -y upgrade
+RUN apt-get -y install \
+	autoconf \
+	build-essential \
+	flex \
+	bison \
+	ncurses-dev \
+	libreadline-dev
diff --git a/misc/docker/fedora-27-amd64/Dockerfile b/misc/docker/fedora-27-amd64/Dockerfile
new file mode 100644
index 00000000..0848216d
--- /dev/null
+++ b/misc/docker/fedora-27-amd64/Dockerfile
@@ -0,0 +1,10 @@
+FROM fedora:27
+RUN dnf -y upgrade
+RUN dnf -y install \
+	autoconf \
+	flex \
+	bison \
+	pkgconfig \
+	'readline-devel' \
+	'pkgconfig(ncurses)' \
+	gcc
diff --git a/misc/docker/fedora-28-amd64/Dockerfile b/misc/docker/fedora-28-amd64/Dockerfile
new file mode 100644
index 00000000..dc4a52ca
--- /dev/null
+++ b/misc/docker/fedora-28-amd64/Dockerfile
@@ -0,0 +1,10 @@
+FROM fedora:28
+RUN dnf -y upgrade
+RUN dnf -y install \
+	autoconf \
+	flex \
+	bison \
+	pkgconfig \
+	'readline-devel' \
+	'pkgconfig(ncurses)' \
+	gcc
diff --git a/misc/docker/fedora-29-amd64/Dockerfile b/misc/docker/fedora-29-amd64/Dockerfile
new file mode 100644
index 00000000..f91497f5
--- /dev/null
+++ b/misc/docker/fedora-29-amd64/Dockerfile
@@ -0,0 +1,10 @@
+FROM fedora:29
+RUN dnf -y upgrade
+RUN dnf -y install \
+	autoconf \
+	flex \
+	bison \
+	pkgconfig \
+	'readline-devel' \
+	'pkgconfig(ncurses)' \
+	gcc
diff --git a/misc/docker/fedora-30-amd64/Dockerfile b/misc/docker/fedora-30-amd64/Dockerfile
new file mode 100644
index 00000000..16fc2d80
--- /dev/null
+++ b/misc/docker/fedora-30-amd64/Dockerfile
@@ -0,0 +1,10 @@
+FROM fedora:30
+RUN dnf -y upgrade
+RUN dnf -y install \
+	autoconf \
+	flex \
+	bison \
+	pkgconfig \
+	'readline-devel' \
+	'pkgconfig(ncurses)' \
+	gcc
diff --git a/misc/docker/fedora-31-amd64/Dockerfile b/misc/docker/fedora-31-amd64/Dockerfile
new file mode 100644
index 00000000..95aa06ed
--- /dev/null
+++ b/misc/docker/fedora-31-amd64/Dockerfile
@@ -0,0 +1,10 @@
+FROM fedora:31
+RUN dnf -y upgrade
+RUN dnf -y install \
+	autoconf \
+	flex \
+	bison \
+	pkgconfig \
+	'readline-devel' \
+	'pkgconfig(ncurses)' \
+	gcc