diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7313605..3642b671 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,20 +67,22 @@ docker_debian-11-amd64:
     IMG_NAME: "debian-11-amd64"
   <<: *docker_build
 
-docker_debian-11-i386:
-  variables:
-    IMG_NAME: "debian-11-i386"
-  <<: *docker_build
+# GPG error
+#docker_debian-11-i386:
+#  variables:
+#    IMG_NAME: "debian-11-i386"
+#  <<: *docker_build
 
 docker_debian-testing-amd64:
   variables:
     IMG_NAME: "debian-testing-amd64"
   <<: *docker_build
 
-docker_debian-testing-i386:
-  variables:
-    IMG_NAME: "debian-testing-i386"
-  <<: *docker_build
+# GPG error
+#docker_debian-testing-i386:
+#  variables:
+#    IMG_NAME: "debian-testing-i386"
+#  <<: *docker_build
 
 docker_fedora-25-amd64:
   variables:
@@ -146,17 +148,17 @@ 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-18_04-amd64:
   variables:
     IMG_NAME: "ubuntu-18.04-amd64"
   <<: *docker_build
- 
+
 docker_ubuntu-20_04-amd64:
   variables:
     IMG_NAME: "ubuntu-20.04-amd64"
@@ -167,10 +169,11 @@ docker_ubuntu-20_10-amd64:
     IMG_NAME: "ubuntu-20.10-amd64"
   <<: *docker_build
 
-docker_ubuntu-21_04-amd64:
-  variables:
-    IMG_NAME: "ubuntu-21.04-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:
@@ -257,17 +260,17 @@ build-debian-11-amd64:
   <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:debian-11-amd64
 
-build-debian-11-i386:
-  <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:debian-11-i386
+#build-debian-11-i386:
+#  <<: *build-linux
+#  image: registry.labs.nic.cz/labs/bird:debian-11-i386
 
 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
@@ -337,9 +340,9 @@ build-ubuntu-20_10-amd64:
   <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:ubuntu-20.10-amd64
 
-build-ubuntu-21_04-amd64:
-  <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:ubuntu-21.04-amd64
+#build-ubuntu-21_04-amd64:
+#  <<: *build-linux
+#  image: registry.labs.nic.cz/labs/bird:ubuntu-21.04-amd64
 
 build-opensuse-15.0-amd64:
   <<: *build-linux
@@ -370,38 +373,147 @@ build-freebsd-11-i386:
     - i386
 
 
-.pkg-debian: &pkg-debian
+.pkg-deb: &pkg-deb
   stage: pkg
   script:
-  - pip3 install apkg
-  - apkg build
-  - apkg install -y pkg/pkgs/*/*/*.deb
+    - pip3 install apkg
+    - apkg build
+    #- apkg install -y pkg/pkgs/*/*/*.deb
+  artifacts:
+    paths:
+      - pkg/pkgs/*
 
+.pkg-rpm: &pkg-rpm
+  stage: pkg
+  script:
+    - pip3 install apkg
+    - apkg build
+    #- apkg install -y pkg/pkgs/*/*/*.rpm
+  artifacts:
+    paths:
+      - pkg/pkgs/*
+
+.pkg-rpm-wa: &pkg-rpm-wa
+  stage: pkg
+  script:
+    - sed -i "s/runstatedir/with-runtimedir/" distro/pkg/rpm/bird.spec
+    - pip3 install apkg
+    - apkg build
+    #- apkg install -y pkg/pkgs/*/*/*.rpm
+  artifacts:
+    paths:
+      - pkg/pkgs/*
+
+# Dpkg error: PATH is not set
+#pkg-debian-8-amd64:
+#  <<: *pkg-deb
+#  needs: [build-debian-8-amd64]
+#  image: registry.labs.nic.cz/labs/bird:debian-8-amd64
+
+# Dpkg error: PATH is not set
+#pkg-debian-8-i386:
+#  <<: *pkg-deb
+#  needs: [build-debian-8-i386]
+#  image: registry.labs.nic.cz/labs/bird:debian-8-i386
+
+# Dpkg error: PATH is not set
 pkg-debian-9-amd64:
-  <<: *pkg-debian
+  <<: *pkg-deb
   needs: [build-debian-9-amd64]
   image: registry.labs.nic.cz/labs/bird:debian-9-amd64
 
+# Dpkg error: PATH is not set
 pkg-debian-9-i386:
-  <<: *pkg-debian
+  <<: *pkg-deb
   needs: [build-debian-9-i386]
   image: registry.labs.nic.cz/labs/bird:debian-9-i386
 
 pkg-debian-10-amd64:
-  <<: *pkg-debian
+  <<: *pkg-deb
   needs: [build-debian-10-amd64]
   image: registry.labs.nic.cz/labs/bird:debian-10-amd64
 
 pkg-debian-10-i386:
-  <<: *pkg-debian
+  <<: *pkg-deb
   needs: [build-debian-10-i386]
   image: registry.labs.nic.cz/labs/bird:debian-10-i386
 
 pkg-debian-11-amd64:
-  <<: *pkg-debian
+  <<: *pkg-deb
   needs: [build-debian-11-amd64]
   image: registry.labs.nic.cz/labs/bird:debian-11-amd64
 
+pkg-fedora-30-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-fedora-30-amd64]
+  image: registry.labs.nic.cz/labs/bird:fedora-30-amd64
+
+pkg-fedora-31-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-fedora-31-amd64]
+  image: registry.labs.nic.cz/labs/bird:fedora-31-amd64
+
+pkg-fedora-32-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-fedora-32-amd64]
+  image: registry.labs.nic.cz/labs/bird:fedora-32-amd64
+
+pkg-fedora-33-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-fedora-33-amd64]
+  image: registry.labs.nic.cz/labs/bird:fedora-33-amd64
+
+pkg-fedora-34-amd64:
+  <<: *pkg-rpm
+  needs: [build-fedora-34-amd64]
+  image: registry.labs.nic.cz/labs/bird:fedora-34-amd64
+
+# UnicodeDecodeError
+#pkg-centos-7-amd64:
+#  <<: *pkg-rpm-wa
+#  needs: [build-centos-7-amd64]
+#  image: registry.labs.nic.cz/labs/bird:centos-7-amd64
+
+pkg-centos-8-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-centos-8-amd64]
+  image: registry.labs.nic.cz/labs/bird:centos-8-amd64
+
+pkg-ubuntu-18.04-amd64:
+  <<: *pkg-deb
+  needs: [build-ubuntu-18_04-amd64]
+  image: registry.labs.nic.cz/labs/bird:ubuntu-18.04-amd64
+
+pkg-ubuntu-20.04-amd64:
+  <<: *pkg-deb
+  needs: [build-ubuntu-20_04-amd64]
+  image: registry.labs.nic.cz/labs/bird:ubuntu-20.04-amd64
+
+pkg-ubuntu-20.10-amd64:
+  <<: *pkg-deb
+  needs: [build-ubuntu-20_10-amd64]
+  image: registry.labs.nic.cz/labs/bird:ubuntu-20.10-amd64
+
+#pkg-ubuntu-21.04-amd64:
+#  <<: *pkg-deb
+#  needs: [build-ubuntu-21_04-amd64]
+#  image: registry.labs.nic.cz/labs/bird:ubuntu-21.04-amd64
+
+pkg-opensuse-15.1-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-opensuse-15.1-amd64]
+  image: registry.labs.nic.cz/labs/bird:opensuse-15.1-amd64
+
+pkg-opensuse-15.2-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-opensuse-15.2-amd64]
+  image: registry.labs.nic.cz/labs/bird:opensuse-15.2-amd64
+
+pkg-opensuse-15.3-amd64:
+  <<: *pkg-rpm-wa
+  needs: [build-opensuse-15.3-amd64]
+  image: registry.labs.nic.cz/labs/bird:opensuse-15.3-amd64
+
 
 build-birdlab:
   stage: build
@@ -454,10 +566,10 @@ test-ospf-ptmp:
   variables:
     TEST_NAME: cf-ospf-ptmp
 
-# test-ospf-authentication:
-#   <<: *test-base
-#   variables:
-#     TEST_NAME: cf-ospf-authentication
+test-ospf-authentication:
+  <<: *test-base
+  variables:
+    TEST_NAME: cf-ospf-authentication
 
 test-ospf-bfd:
   <<: *test-base
diff --git a/misc/docker/centos-7-amd64/Dockerfile b/misc/docker/centos-7-amd64/Dockerfile
index c01731b2..bef04b00 100644
--- a/misc/docker/centos-7-amd64/Dockerfile
+++ b/misc/docker/centos-7-amd64/Dockerfile
@@ -1,11 +1,18 @@
 FROM centos:7
 RUN yum -y upgrade
 RUN yum -y install \
-	autoconf \
+	gcc \
+	make \
 	flex \
 	bison \
-	pkgconfig \
-	'readline-devel' \
-	'pkgconfig(ncurses)' \
-	gcc \
-	make
+	autoconf \
+	libssh-devel \
+	ncurses-devel \
+	readline-devel
+RUN yum -y install \
+	git \
+	rpm-build \
+	systemd \
+	python3 \
+	python3-pip \
+	python3-setuptools
diff --git a/misc/docker/centos-8-amd64/Dockerfile b/misc/docker/centos-8-amd64/Dockerfile
index ed1081ed..3bc5acc3 100644
--- a/misc/docker/centos-8-amd64/Dockerfile
+++ b/misc/docker/centos-8-amd64/Dockerfile
@@ -1,11 +1,18 @@
 FROM centos:8
 RUN yum -y upgrade
 RUN yum -y install \
-	autoconf \
+	gcc \
+	make \
 	flex \
 	bison \
-	pkgconfig \
-	'readline-devel' \
-	'pkgconfig(ncurses)' \
-	gcc \
-	make
+	autoconf \
+	libssh-devel \
+	ncurses-devel \
+	readline-devel
+RUN yum -y install \
+	git \
+	rpm-build \
+	systemd-rpm-macros \
+	python3 \
+	python3-pip \
+	python3-setuptools
diff --git a/misc/docker/debian-10-amd64/Dockerfile b/misc/docker/debian-10-amd64/Dockerfile
index d91322cd..a241bb23 100644
--- a/misc/docker/debian-10-amd64/Dockerfile
+++ b/misc/docker/debian-10-amd64/Dockerfile
@@ -4,10 +4,10 @@ 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 --no-install-recommends install \
-	autoconf \
 	build-essential \
 	flex \
 	bison \
+	autoconf \
 	ncurses-dev \
 	libreadline-dev \
 	libssh-gcrypt-dev \
diff --git a/misc/docker/debian-10-i386/Dockerfile b/misc/docker/debian-10-i386/Dockerfile
index 878f5a7e..6b28a20a 100644
--- a/misc/docker/debian-10-i386/Dockerfile
+++ b/misc/docker/debian-10-i386/Dockerfile
@@ -4,10 +4,10 @@ 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 --no-install-recommends install \
-	autoconf \
 	build-essential \
 	flex \
 	bison \
+	autoconf \
 	ncurses-dev \
 	libreadline-dev \
 	libssh-gcrypt-dev \
diff --git a/misc/docker/debian-11-amd64/Dockerfile b/misc/docker/debian-11-amd64/Dockerfile
index e91a8b3a..a9aee7e9 100644
--- a/misc/docker/debian-11-amd64/Dockerfile
+++ b/misc/docker/debian-11-amd64/Dockerfile
@@ -1,14 +1,13 @@
 FROM amd64/debian:bullseye-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 --no-install-recommends install \
-	autoconf \
 	build-essential \
 	flex \
 	bison \
+	autoconf \
 	ncurses-dev \
 	libreadline-dev \
 	libssh-gcrypt-dev \
diff --git a/misc/docker/debian-11-i386/Dockerfile b/misc/docker/debian-11-i386/Dockerfile
index d599dbfc..5b5ad5a3 100644
--- a/misc/docker/debian-11-i386/Dockerfile
+++ b/misc/docker/debian-11-i386/Dockerfile
@@ -1,13 +1,25 @@
 FROM i386/debian:bullseye-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 && apt-get -y upgrade
-RUN apt-get -y install \
-	autoconf \
+RUN apt-get -y --no-install-recommends install \
 	build-essential \
 	flex \
 	bison \
+	autoconf \
 	ncurses-dev \
-	libreadline-dev
-
+	libreadline-dev \
+	libssh-gcrypt-dev \
+	linuxdoc-tools-latex \
+	texlive-latex-extra \
+	opensp \
+	docbook-xsl \
+	xsltproc
+RUN apt-get -y --no-install-recommends install \
+	git \
+	dpkg-dev \
+	debhelper \
+	quilt \
+	python3 \
+	python3-pip \
+	python3-setuptools
diff --git a/misc/docker/debian-7-amd64/Dockerfile b/misc/docker/debian-7-amd64/Dockerfile
index a4a3841e..9510e9cf 100644
--- a/misc/docker/debian-7-amd64/Dockerfile
+++ b/misc/docker/debian-7-amd64/Dockerfile
@@ -5,9 +5,9 @@ RUN echo 'deb http://archive.debian.org/debian-security/ wheezy/updates main' >>
 RUN apt-get -y update -o Acquire::Check-Valid-Until=false
 RUN apt-get -y upgrade
 RUN apt-get -y install \
-	autoconf \
 	build-essential \
 	flex \
 	bison \
+	autoconf \
 	ncurses-dev \
 	libreadline-dev
diff --git a/misc/docker/debian-7-i386/Dockerfile b/misc/docker/debian-7-i386/Dockerfile
index aa9019ce..d47d8e08 100644
--- a/misc/docker/debian-7-i386/Dockerfile
+++ b/misc/docker/debian-7-i386/Dockerfile
@@ -5,9 +5,9 @@ RUN echo 'deb http://archive.debian.org/debian-security/ wheezy/updates main' >>
 RUN apt-get -y update -o Acquire::Check-Valid-Until=false
 RUN apt-get -y upgrade
 RUN apt-get -y install \
-	autoconf \
 	build-essential \
 	flex \
 	bison \
+	autoconf \
 	ncurses-dev \
 	libreadline-dev
diff --git a/misc/docker/debian-8-amd64/Dockerfile b/misc/docker/debian-8-amd64/Dockerfile
index d0e8ed0a..d9520132 100644
--- a/misc/docker/debian-8-amd64/Dockerfile
+++ b/misc/docker/debian-8-amd64/Dockerfile
@@ -4,9 +4,9 @@ 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 \
+	autoconf \
 	ncurses-dev \
 	libreadline-dev
diff --git a/misc/docker/debian-8-i386/Dockerfile b/misc/docker/debian-8-i386/Dockerfile
index 9dd6f022..349fcee9 100644
--- a/misc/docker/debian-8-i386/Dockerfile
+++ b/misc/docker/debian-8-i386/Dockerfile
@@ -4,9 +4,9 @@ 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 \
+	autoconf \
 	ncurses-dev \
 	libreadline-dev
diff --git a/misc/docker/debian-9-amd64/Dockerfile b/misc/docker/debian-9-amd64/Dockerfile
index e3b19657..4e8603f0 100644
--- a/misc/docker/debian-9-amd64/Dockerfile
+++ b/misc/docker/debian-9-amd64/Dockerfile
@@ -4,10 +4,10 @@ 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 --no-install-recommends install \
-	autoconf \
 	build-essential \
 	flex \
 	bison \
+	autoconf \
 	ncurses-dev \
 	libreadline-dev \
 	libssh-gcrypt-dev \
diff --git a/misc/docker/debian-9-i386/Dockerfile b/misc/docker/debian-9-i386/Dockerfile
index 52effbbf..d37a742d 100644
--- a/misc/docker/debian-9-i386/Dockerfile
+++ b/misc/docker/debian-9-i386/Dockerfile
@@ -4,10 +4,10 @@ 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 --no-install-recommends install \
-	autoconf \
 	build-essential \
 	flex \
 	bison \
+	autoconf \
 	ncurses-dev \
 	libreadline-dev \
 	libssh-gcrypt-dev \
diff --git a/misc/docker/debian-testing-amd64/Dockerfile b/misc/docker/debian-testing-amd64/Dockerfile
index 3b66e3fa..6d7bbbeb 100644
--- a/misc/docker/debian-testing-amd64/Dockerfile
+++ b/misc/docker/debian-testing-amd64/Dockerfile
@@ -4,9 +4,9 @@ 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 \
+	autoconf \
 	ncurses-dev \
 	libreadline-dev
diff --git a/misc/docker/debian-testing-i386/Dockerfile b/misc/docker/debian-testing-i386/Dockerfile
index 998ce969..3d6a969c 100644
--- a/misc/docker/debian-testing-i386/Dockerfile
+++ b/misc/docker/debian-testing-i386/Dockerfile
@@ -4,9 +4,9 @@ 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 \
+	autoconf \
 	ncurses-dev \
 	libreadline-dev
diff --git a/misc/docker/fedora-30-amd64/Dockerfile b/misc/docker/fedora-30-amd64/Dockerfile
index 57561422..d9aaa62a 100644
--- a/misc/docker/fedora-30-amd64/Dockerfile
+++ b/misc/docker/fedora-30-amd64/Dockerfile
@@ -1,11 +1,18 @@
 FROM fedora:30
-RUN dnf -y upgrade
+RUN dnf -y update
 RUN dnf -y install \
+	gcc \
 	make \
-	autoconf \
 	flex \
 	bison \
-	pkgconfig \
-	'readline-devel' \
-	'pkgconfig(ncurses)' \
-	gcc
+	autoconf \
+	libssh-devel \
+	ncurses-devel \
+	readline-devel
+RUN dnf -y install \
+	git \
+	rpm-build \
+	systemd-rpm-macros \
+	python3 \
+	python3-pip \
+	python3-setuptools
diff --git a/misc/docker/fedora-31-amd64/Dockerfile b/misc/docker/fedora-31-amd64/Dockerfile
index 48e410e6..9f7ad0cd 100644
--- a/misc/docker/fedora-31-amd64/Dockerfile
+++ b/misc/docker/fedora-31-amd64/Dockerfile
@@ -1,11 +1,18 @@
 FROM fedora:31
-RUN dnf -y upgrade
+RUN dnf -y update
 RUN dnf -y install \
+	gcc \
 	make \
-	autoconf \
 	flex \
 	bison \
-	pkgconfig \
-	'readline-devel' \
-	'pkgconfig(ncurses)' \
-	gcc
+	autoconf \
+	libssh-devel \
+	ncurses-devel \
+	readline-devel
+RUN dnf -y install \
+	git \
+	rpm-build \
+	systemd-rpm-macros \
+	python3 \
+	python3-pip \
+	python3-setuptools
diff --git a/misc/docker/fedora-32-amd64/Dockerfile b/misc/docker/fedora-32-amd64/Dockerfile
index 6c8d6dac..609dbf33 100644
--- a/misc/docker/fedora-32-amd64/Dockerfile
+++ b/misc/docker/fedora-32-amd64/Dockerfile
@@ -1,13 +1,18 @@
 FROM fedora:32
-
-RUN dnf -y update  && dnf -y upgrade
+RUN dnf -y update
 RUN dnf -y install \
-        make \
-        autoconf \
-        flex \
-        bison \
-        pkgconfig \
-        "readline-devel" \
-        "pkgconfig(ncurses)" \
-        gcc
-
+	gcc \
+	make \
+	flex \
+	bison \
+	autoconf \
+	libssh-devel \
+	ncurses-devel \
+	readline-devel
+RUN dnf -y install \
+	git \
+	rpm-build \
+	systemd-rpm-macros \
+	python3 \
+	python3-pip \
+	python3-setuptools
diff --git a/misc/docker/fedora-33-amd64/Dockerfile b/misc/docker/fedora-33-amd64/Dockerfile
index 5551fe53..7e707068 100644
--- a/misc/docker/fedora-33-amd64/Dockerfile
+++ b/misc/docker/fedora-33-amd64/Dockerfile
@@ -1,13 +1,18 @@
 FROM fedora:33
-
-RUN dnf -y update  && dnf -y upgrade
+RUN dnf -y upgrade
 RUN dnf -y install \
-        make \
-        autoconf \
-        flex \
-        bison \
-        pkgconfig \
-        "readline-devel" \
-        "pkgconfig(ncurses)" \
-        gcc
-
+	gcc \
+	make \
+	flex \
+	bison \
+	autoconf \
+	libssh-devel \
+	ncurses-devel \
+	readline-devel
+RUN dnf -y install \
+	git \
+	rpm-build \
+	systemd-rpm-macros \
+	python3 \
+	python3-pip \
+	python3-setuptools
diff --git a/misc/docker/fedora-34-amd64/Dockerfile b/misc/docker/fedora-34-amd64/Dockerfile
index ef78db2d..6bd77529 100644
--- a/misc/docker/fedora-34-amd64/Dockerfile
+++ b/misc/docker/fedora-34-amd64/Dockerfile
@@ -1,13 +1,18 @@
 FROM fedora:34
-
-RUN dnf -y update  && dnf -y upgrade
+RUN dnf -y upgrade
 RUN dnf -y install \
-        make \
-        autoconf \
-        flex \
-        bison \
-        pkgconfig \
-        "readline-devel" \
-        "pkgconfig(ncurses)" \
-        gcc
-
+	gcc \
+	make \
+	flex \
+	bison \
+	autoconf \
+	libssh-devel \
+	ncurses-devel \
+	readline-devel
+RUN dnf -y install \
+	git \
+	rpm-build \
+	systemd-rpm-macros \
+	python3 \
+	python3-pip \
+	python3-setuptools
diff --git a/misc/docker/opensuse-15.1-amd64/Dockerfile b/misc/docker/opensuse-15.1-amd64/Dockerfile
index 29d956cf..77a0455d 100644
--- a/misc/docker/opensuse-15.1-amd64/Dockerfile
+++ b/misc/docker/opensuse-15.1-amd64/Dockerfile
@@ -1,11 +1,19 @@
 FROM opensuse/leap:15.1
 RUN zypper -n up
 RUN zypper -n install \
-	autoconf \
+	gcc \
+	make \
 	flex \
 	bison \
-	pkgconfig \
-	readline-devel \
+	autoconf \
+	libssh-devel \
 	ncurses-devel \
-	gcc \
-	gmake
+	readline-devel
+RUN zypper -n install \
+	git \
+	rpm-build \
+	systemd \
+	systemd-rpm-macros \
+	python3 \
+	python3-pip \
+	python3-setuptools
diff --git a/misc/docker/opensuse-15.2-amd64/Dockerfile b/misc/docker/opensuse-15.2-amd64/Dockerfile
index d1acd5c4..44a146db 100644
--- a/misc/docker/opensuse-15.2-amd64/Dockerfile
+++ b/misc/docker/opensuse-15.2-amd64/Dockerfile
@@ -1,12 +1,19 @@
 FROM opensuse/leap:15.2
-
 RUN zypper -n up
 RUN zypper -n install \
-	autoconf \
+	gcc \
+	make \
 	flex \
 	bison \
-	pkgconfig \
-	readline-devel \
+	autoconf \
+	libssh-devel \
 	ncurses-devel \
-	gcc \
-	gmake
+	readline-devel
+RUN zypper -n install \
+	git \
+	rpm-build \
+	systemd \
+	systemd-rpm-macros \
+	python3 \
+	python3-pip \
+	python3-setuptools
diff --git a/misc/docker/opensuse-15.3-amd64/Dockerfile b/misc/docker/opensuse-15.3-amd64/Dockerfile
index 4515e3be..9fe8f4c2 100644
--- a/misc/docker/opensuse-15.3-amd64/Dockerfile
+++ b/misc/docker/opensuse-15.3-amd64/Dockerfile
@@ -1,12 +1,19 @@
 FROM opensuse/leap:15.3
-
 RUN zypper -n up
 RUN zypper -n install \
-	autoconf \
+	gcc \
+	make \
 	flex \
 	bison \
-	pkgconfig \
-	readline-devel \
+	autoconf \
+	libssh-devel \
 	ncurses-devel \
-	gcc \
-	gmake
+	readline-devel
+RUN zypper -n install \
+	git \
+	rpm-build \
+	systemd \
+	systemd-rpm-macros \
+	python3 \
+	python3-pip \
+	python3-setuptools
diff --git a/misc/docker/ubuntu-14.04-amd64/Dockerfile b/misc/docker/ubuntu-14.04-amd64/Dockerfile
index ccac3eb4..35325073 100644
--- a/misc/docker/ubuntu-14.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-14.04-amd64/Dockerfile
@@ -4,9 +4,9 @@ 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 \
+	autoconf \
 	ncurses-dev \
 	libreadline-dev
diff --git a/misc/docker/ubuntu-16.04-amd64/Dockerfile b/misc/docker/ubuntu-16.04-amd64/Dockerfile
index 50a4918c..c27aef15 100644
--- a/misc/docker/ubuntu-16.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-16.04-amd64/Dockerfile
@@ -4,9 +4,9 @@ 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 \
+	autoconf \
 	ncurses-dev \
 	libreadline-dev
diff --git a/misc/docker/ubuntu-18.04-amd64/Dockerfile b/misc/docker/ubuntu-18.04-amd64/Dockerfile
index c68d8972..a1d95317 100644
--- a/misc/docker/ubuntu-18.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-18.04-amd64/Dockerfile
@@ -4,9 +4,24 @@ 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 \
+	autoconf \
 	ncurses-dev \
-	libreadline-dev
+	libreadline-dev \
+	libssh-gcrypt-dev \
+	linuxdoc-tools-latex \
+	texlive-latex-extra \
+	opensp \
+	docbook-xsl \
+	xsltproc
+RUN apt-get -y install \
+	git \
+	dpkg-dev \
+	debhelper \
+	apt-utils \
+	quilt \
+	python3 \
+	python3-pip \
+	python3-setuptools
diff --git a/misc/docker/ubuntu-20.04-amd64/Dockerfile b/misc/docker/ubuntu-20.04-amd64/Dockerfile
index 4b773697..fac1b333 100644
--- a/misc/docker/ubuntu-20.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-20.04-amd64/Dockerfile
@@ -1,14 +1,27 @@
 FROM ubuntu:20.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 \
-
+	build-essential \
+	flex \
+	bison \
+	autoconf \
+	ncurses-dev \
+	libreadline-dev \
+	libssh-gcrypt-dev \
+	linuxdoc-tools-latex \
+	texlive-latex-extra \
+	opensp \
+	docbook-xsl \
+	xsltproc
+RUN apt-get -y install \
+	git \
+	dpkg-dev \
+	debhelper \
+	apt-utils \
+	quilt \
+	python3 \
+	python3-pip \
+	python3-setuptools
diff --git a/misc/docker/ubuntu-20.10-amd64/Dockerfile b/misc/docker/ubuntu-20.10-amd64/Dockerfile
index 0c135280..19cb1b85 100644
--- a/misc/docker/ubuntu-20.10-amd64/Dockerfile
+++ b/misc/docker/ubuntu-20.10-amd64/Dockerfile
@@ -1,14 +1,27 @@
 FROM ubuntu:20.10
-
 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 \
-
+	build-essential \
+	flex \
+	bison \
+	autoconf \
+	ncurses-dev \
+	libreadline-dev \
+	libssh-gcrypt-dev \
+	linuxdoc-tools-latex \
+	texlive-latex-extra \
+	opensp \
+	docbook-xsl \
+	xsltproc
+RUN apt-get -y install \
+	git \
+	dpkg-dev \
+	debhelper \
+	apt-utils \
+	quilt \
+	python3 \
+	python3-pip \
+	python3-setuptools
diff --git a/misc/docker/ubuntu-21.04-amd64/Dockerfile b/misc/docker/ubuntu-21.04-amd64/Dockerfile
index 64dc2f33..1c32727b 100644
--- a/misc/docker/ubuntu-21.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-21.04-amd64/Dockerfile
@@ -1,14 +1,27 @@
 FROM ubuntu:21.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
-
+	build-essential \
+	flex \
+	bison \
+	autoconf \
+	ncurses-dev \
+	libreadline-dev \
+	libssh-gcrypt-dev \
+	linuxdoc-tools-latex \
+	texlive-latex-extra \
+	opensp \
+	docbook-xsl \
+	xsltproc
+RUN apt-get -y install \
+	git \
+	dpkg-dev \
+	debhelper \
+	apt-utils \
+	quilt \
+	python3 \
+	python3-pip \
+	python3-setuptools