diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05dbb64f..29195a98 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -136,6 +136,16 @@ docker_ubuntu-16_04-amd64:
     IMG_NAME: "ubuntu-16.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
+
 .build: &build-base
   stage: build
   script:
@@ -239,6 +249,14 @@ 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-19_04-amd64:
+  <<: *build-linux
+  image: registry.labs.nic.cz/labs/bird:ubuntu-19.04-amd64
+
 build-freebsd-11-amd64:
   <<: *build-base
   tags:
diff --git a/misc/docker/ubuntu-18.04-amd64/Dockerfile b/misc/docker/ubuntu-18.04-amd64/Dockerfile
new file mode 100644
index 00000000..c68d8972
--- /dev/null
+++ b/misc/docker/ubuntu-18.04-amd64/Dockerfile
@@ -0,0 +1,12 @@
+FROM ubuntu:18.04
+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/ubuntu-19.04-amd64/Dockerfile b/misc/docker/ubuntu-19.04-amd64/Dockerfile
new file mode 100644
index 00000000..bb2f72c6
--- /dev/null
+++ b/misc/docker/ubuntu-19.04-amd64/Dockerfile
@@ -0,0 +1,12 @@
+FROM ubuntu:19.04
+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