diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2
index fddec09..39a2bf3 100644
--- a/Dockerfiles/work/Dockerfile-5.2
+++ b/Dockerfiles/work/Dockerfile-5.2
@@ -58,8 +58,8 @@ RUN set -eux \
 	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -100,7 +100,20 @@ RUN set -eux \
 		\
 		mysql-client \
 		\
-		mongodb-clients \
+# 5.2: mongodb-clients (amd64)
+# 5.3: mongodb-clients (amd64)
+# 5.4: mongodb-clients (amd64)
+# 5.5: mongodb-clients (amd64)
+# 5.6: mongodb-clients (amd64, arm64)
+# 7.0: mongodb-clients (amd64, arm64)
+# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
+		$( if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then echo 'mongodb-clients'; fi ) \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -110,6 +123,7 @@ RUN set -eux \
 		patch \
 		patchelf \
 		\
+		postgresql-client \
 		\
 		redis-tools \
 		rsync \
@@ -135,7 +149,20 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	\
+# Check version: mongofiles
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+		mongofiles --version; \
+	fi \
+	\
+# Check version: pg_isready
+	&& pg_isready --version \
+	\
+# Check version: mysql
+	&& mysql --version \
+	\
+	&& true
 
 
 ###
diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3
index 14ffa81..bd24d61 100644
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -58,8 +58,8 @@ RUN set -eux \
 	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -100,7 +100,20 @@ RUN set -eux \
 		\
 		mysql-client \
 		\
-		mongodb-clients \
+# 5.2: mongodb-clients (amd64)
+# 5.3: mongodb-clients (amd64)
+# 5.4: mongodb-clients (amd64)
+# 5.5: mongodb-clients (amd64)
+# 5.6: mongodb-clients (amd64, arm64)
+# 7.0: mongodb-clients (amd64, arm64)
+# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
+		$( if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then echo 'mongodb-clients'; fi ) \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -110,6 +123,7 @@ RUN set -eux \
 		patch \
 		patchelf \
 		\
+		postgresql-client \
 		\
 		redis-tools \
 		rsync \
@@ -135,7 +149,20 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	\
+# Check version: mongofiles
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+		mongofiles --version; \
+	fi \
+	\
+# Check version: pg_isready
+	&& pg_isready --version \
+	\
+# Check version: mysql
+	&& mysql --version \
+	\
+	&& true
 
 
 ###
diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
index 79da8a5..e1d933c 100644
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -58,8 +58,8 @@ RUN set -eux \
 	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -100,7 +100,20 @@ RUN set -eux \
 		\
 		mysql-client \
 		\
-		mongodb-clients \
+# 5.2: mongodb-clients (amd64)
+# 5.3: mongodb-clients (amd64)
+# 5.4: mongodb-clients (amd64)
+# 5.5: mongodb-clients (amd64)
+# 5.6: mongodb-clients (amd64, arm64)
+# 7.0: mongodb-clients (amd64, arm64)
+# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
+		$( if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then echo 'mongodb-clients'; fi ) \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -110,6 +123,7 @@ RUN set -eux \
 		patch \
 		patchelf \
 		\
+		postgresql-client \
 		\
 		redis-tools \
 		rsync \
@@ -135,7 +149,20 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	\
+# Check version: mongofiles
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+		mongofiles --version; \
+	fi \
+	\
+# Check version: pg_isready
+	&& pg_isready --version \
+	\
+# Check version: mysql
+	&& mysql --version \
+	\
+	&& true
 
 
 ###
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
index 20a47db..3a4bee7 100644
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -58,8 +58,8 @@ RUN set -eux \
 	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -100,7 +100,20 @@ RUN set -eux \
 		\
 		mysql-client \
 		\
-		mongodb-clients \
+# 5.2: mongodb-clients (amd64)
+# 5.3: mongodb-clients (amd64)
+# 5.4: mongodb-clients (amd64)
+# 5.5: mongodb-clients (amd64)
+# 5.6: mongodb-clients (amd64, arm64)
+# 7.0: mongodb-clients (amd64, arm64)
+# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
+		$( if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then echo 'mongodb-clients'; fi ) \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -110,6 +123,7 @@ RUN set -eux \
 		patch \
 		patchelf \
 		\
+		postgresql-client \
 		\
 		redis-tools \
 		rsync \
@@ -135,7 +149,20 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	\
+# Check version: mongofiles
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+		mongofiles --version; \
+	fi \
+	\
+# Check version: pg_isready
+	&& pg_isready --version \
+	\
+# Check version: mysql
+	&& mysql --version \
+	\
+	&& true
 
 
 ###
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
index cbaaa29..3b99f8a 100644
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -58,8 +58,8 @@ RUN set -eux \
 	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -101,7 +101,21 @@ RUN set -eux \
 		\
 		mysql-client \
 		\
+# 5.2: mongodb-clients (amd64)
+# 5.3: mongodb-clients (amd64)
+# 5.4: mongodb-clients (amd64)
+# 5.5: mongodb-clients (amd64)
+# 5.6: mongodb-clients (amd64, arm64)
+# 7.0: mongodb-clients (amd64, arm64)
+# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
 		mongodb-clients \
+		mongo-tools \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -111,6 +125,7 @@ RUN set -eux \
 		patch \
 		patchelf \
 		\
+		postgresql-client \
 		\
 		redis-tools \
 		rsync \
@@ -137,7 +152,18 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	\
+# Check version: mongofiles
+	&& mongofiles --version \
+	\
+# Check version: pg_isready
+	&& pg_isready --version \
+	\
+# Check version: mysql
+	&& mysql --version \
+	\
+	&& true
 
 
 ###
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
index 8261768..aa04a28 100644
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -58,8 +58,8 @@ RUN set -eux \
 	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -101,7 +101,21 @@ RUN set -eux \
 		\
 		mysql-client \
 		\
+# 5.2: mongodb-clients (amd64)
+# 5.3: mongodb-clients (amd64)
+# 5.4: mongodb-clients (amd64)
+# 5.5: mongodb-clients (amd64)
+# 5.6: mongodb-clients (amd64, arm64)
+# 7.0: mongodb-clients (amd64, arm64)
+# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
 		mongodb-clients \
+		mongo-tools \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -111,6 +125,7 @@ RUN set -eux \
 		patch \
 		patchelf \
 		\
+		postgresql-client \
 		\
 		redis-tools \
 		rsync \
@@ -137,7 +152,18 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	\
+# Check version: mongofiles
+	&& mongofiles --version \
+	\
+# Check version: pg_isready
+	&& pg_isready --version \
+	\
+# Check version: mysql
+	&& mysql --version \
+	\
+	&& true
 
 
 ###
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
index 427e77b..339325d 100644
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -55,11 +55,13 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+	&& echo "deb http://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -101,7 +103,21 @@ RUN set -eux \
 		\
 		mariadb-client \
 		\
-		mongo-tools \
+# 5.2: mongodb-clients (amd64)
+# 5.3: mongodb-clients (amd64)
+# 5.4: mongodb-clients (amd64)
+# 5.5: mongodb-clients (amd64)
+# 5.6: mongodb-clients (amd64, arm64)
+# 7.0: mongodb-clients (amd64, arm64)
+# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
+		mongodb-org-tools \
+		mongodb-org-shell \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -137,7 +153,18 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	\
+# Check version: mongofiles
+	&& mongofiles --version \
+	\
+# Check version: pg_isready
+	&& pg_isready --version \
+	\
+# Check version: mysql
+	&& mysql --version \
+	\
+	&& true
 
 
 ###
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
index df691e6..db73d32 100644
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -55,11 +55,13 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+	&& echo "deb http://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -101,7 +103,21 @@ RUN set -eux \
 		\
 		mariadb-client \
 		\
-		mongo-tools \
+# 5.2: mongodb-clients (amd64)
+# 5.3: mongodb-clients (amd64)
+# 5.4: mongodb-clients (amd64)
+# 5.5: mongodb-clients (amd64)
+# 5.6: mongodb-clients (amd64, arm64)
+# 7.0: mongodb-clients (amd64, arm64)
+# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
+		mongodb-org-tools \
+		mongodb-org-shell \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -137,7 +153,18 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	\
+# Check version: mongofiles
+	&& mongofiles --version \
+	\
+# Check version: pg_isready
+	&& pg_isready --version \
+	\
+# Check version: mysql
+	&& mysql --version \
+	\
+	&& true
 
 
 ###
diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3
index 0c2b751..84291ab 100644
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -55,13 +55,13 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
 	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
-	&& echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" > /etc/apt/sources.list.d/mongo.list \
+	&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -103,6 +103,19 @@ RUN set -eux \
 		\
 		mariadb-client \
 		\
+# 5.2: mongodb-clients (amd64)
+# 5.3: mongodb-clients (amd64)
+# 5.4: mongodb-clients (amd64)
+# 5.5: mongodb-clients (amd64)
+# 5.6: mongodb-clients (amd64, arm64)
+# 7.0: mongodb-clients (amd64, arm64)
+# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
 		mongodb-org-tools \
 		mongodb-org-shell \
 		mupdf \
@@ -140,7 +153,18 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	\
+# Check version: mongofiles
+	&& mongofiles --version \
+	\
+# Check version: pg_isready
+	&& pg_isready --version \
+	\
+# Check version: mysql
+	&& mysql --version \
+	\
+	&& true
 
 
 ###
diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4
index cc4ea14..c501a92 100644
--- a/Dockerfiles/work/Dockerfile-7.4
+++ b/Dockerfiles/work/Dockerfile-7.4
@@ -55,13 +55,13 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
 	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
-	&& echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" > /etc/apt/sources.list.d/mongo.list \
+	&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -103,6 +103,19 @@ RUN set -eux \
 		\
 		mariadb-client \
 		\
+# 5.2: mongodb-clients (amd64)
+# 5.3: mongodb-clients (amd64)
+# 5.4: mongodb-clients (amd64)
+# 5.5: mongodb-clients (amd64)
+# 5.6: mongodb-clients (amd64, arm64)
+# 7.0: mongodb-clients (amd64, arm64)
+# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
 		mongodb-org-tools \
 		mongodb-org-shell \
 		mupdf \
@@ -140,7 +153,18 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	\
+# Check version: mongofiles
+	&& mongofiles --version \
+	\
+# Check version: pg_isready
+	&& pg_isready --version \
+	\
+# Check version: mysql
+	&& mysql --version \
+	\
+	&& true
 
 
 ###
diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0
index 2830296..d759bbe 100644
--- a/Dockerfiles/work/Dockerfile-8.0
+++ b/Dockerfiles/work/Dockerfile-8.0
@@ -55,13 +55,13 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
 	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
-	&& echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" > /etc/apt/sources.list.d/mongo.list \
+	&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -103,6 +103,19 @@ RUN set -eux \
 		\
 		mariadb-client \
 		\
+# 5.2: mongodb-clients (amd64)
+# 5.3: mongodb-clients (amd64)
+# 5.4: mongodb-clients (amd64)
+# 5.5: mongodb-clients (amd64)
+# 5.6: mongodb-clients (amd64, arm64)
+# 7.0: mongodb-clients (amd64, arm64)
+# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
 		mongodb-org-tools \
 		mongodb-org-shell \
 		mupdf \
@@ -140,7 +153,18 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	\
+# Check version: mongofiles
+	&& mongofiles --version \
+	\
+# Check version: pg_isready
+	&& pg_isready --version \
+	\
+# Check version: mysql
+	&& mysql --version \
+	\
+	&& true
 
 
 ###
diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1
index 77d7ad7..3f8e82c 100644
--- a/Dockerfiles/work/Dockerfile-8.1
+++ b/Dockerfiles/work/Dockerfile-8.1
@@ -55,13 +55,13 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
 	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
-	&& echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" > /etc/apt/sources.list.d/mongo.list \
+	&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -103,6 +103,19 @@ RUN set -eux \
 		\
 		mariadb-client \
 		\
+# 5.2: mongodb-clients (amd64)
+# 5.3: mongodb-clients (amd64)
+# 5.4: mongodb-clients (amd64)
+# 5.5: mongodb-clients (amd64)
+# 5.6: mongodb-clients (amd64, arm64)
+# 7.0: mongodb-clients (amd64, arm64)
+# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
 		mongodb-org-tools \
 		mongodb-org-shell \
 		mupdf \
@@ -140,7 +153,18 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	\
+# Check version: mongofiles
+	&& mongofiles --version \
+	\
+# Check version: pg_isready
+	&& pg_isready --version \
+	\
+# Check version: mysql
+	&& mysql --version \
+	\
+	&& true
 
 
 ###
diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2
index 8c4e268..f429983 100644
--- a/Dockerfiles/work/Dockerfile-8.2
+++ b/Dockerfiles/work/Dockerfile-8.2
@@ -55,13 +55,13 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
 	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
-	&& echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" > /etc/apt/sources.list.d/mongo.list \
+	&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -103,6 +103,19 @@ RUN set -eux \
 		\
 		mariadb-client \
 		\
+# 5.2: mongodb-clients (amd64)
+# 5.3: mongodb-clients (amd64)
+# 5.4: mongodb-clients (amd64)
+# 5.5: mongodb-clients (amd64)
+# 5.6: mongodb-clients (amd64, arm64)
+# 7.0: mongodb-clients (amd64, arm64)
+# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
 		mongodb-org-tools \
 		mongodb-org-shell \
 		mupdf \
@@ -140,7 +153,18 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	\
+# Check version: mongofiles
+	&& mongofiles --version \
+	\
+# Check version: pg_isready
+	&& pg_isready --version \
+	\
+# Check version: mysql
+	&& mysql --version \
+	\
+	&& true
 
 
 ###
diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2
index 4ee6397..8a68ed5 100644
--- a/build/ansible/DOCKERFILES/Dockerfile-work.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2
@@ -126,9 +126,23 @@ RUN set -eux \
 		mysql-client \
 {% endif %}
 		\
-{% if php_version in [5.2, 5.3, 5.4, 5.5, 5.6, 7.0] %}
+# 5.2: mongodb-clients (amd64)
+# 5.3: mongodb-clients (amd64)
+# 5.4: mongodb-clients (amd64)
+# 5.5: mongodb-clients (amd64)
+# 5.6: mongodb-clients (amd64, arm64)
+# 7.0: mongodb-clients (amd64, arm64)
+# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
+{% if php_version in [5.2, 5.3, 5.4, 5.5] %}
+		$( if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then echo 'mongodb-clients'; fi ) \
+{% elif php_version in [5.6, 7.0] %}
 		mongodb-clients \
-{% elif php_version in [7.1, 7.2] %}
 		mongo-tools \
 {% else %}
 		mongodb-org-tools \
@@ -143,9 +157,9 @@ RUN set -eux \
 		patch \
 		patchelf \
 		\
-{% if php_version not in [5.2, 5.3, 5.4, 5.5, 5.6, 7.0] %}
+{# if php_version not in [5.2, 5.3, 5.4, 5.5, 5.6, 7.0] #}
 		postgresql-client \
-{% endif %}
+{# endif #}
 		\
 		redis-tools \
 		rsync \
@@ -174,7 +188,26 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	\
+# Check version: mongofiles
+{% if php_version in [5.2, 5.3, 5.4, 5.5] %}
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+		mongofiles --version; \
+	fi \
+{% else %}
+	&& mongofiles --version \
+{% endif %}
+	\
+# Check version: pg_isready
+{# if php_version not in [5.2, 5.3, 5.4, 5.5, 5.6, 7.0] #}
+	&& pg_isready --version \
+{# endif #}
+	\
+# Check version: mysql
+	&& mysql --version \
+	\
+	&& true
 
 
 ###
diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml
index 2393be9..ee986c3 100644
--- a/build/ansible/group_vars/all/work.yml
+++ b/build/ansible/group_vars/all/work.yml
@@ -7,19 +7,57 @@
 # This file holds definition for all devibox/php-fpm:x.y-work images
 #
 
-# PHP-5.2: Jessie
-# PHP-5.3: Jessie
-# PHP-5.4: Jessie
-# PHP-5.5: Jessie
-# PHP-5.6: Strech
-# PHP-7.0: Stretch
-# PHP-7.1: Buster
-# PHP-7.2: Buster
-# PHP-7.3: Bullseye
-# PHP-7.4: Bullseye
-# PHP-8.0: Bullseye
-# PHP-8.1: Bullseye
-# PHP-8.2: Bullseye
+
+###
+### Define operating system versions
+###
+os_release:
+  # Jessie (Ubuntu: trusty, utopic, vivid, wily)
+  5.2:
+    debian: jessie
+    ubuntu: trusty
+  5.3:
+    debian: jessie
+    ubuntu: trusty
+  5.4:
+    debian: jessie
+    ubuntu: trusty
+  5.5:
+    debian: jessie
+    ubuntu: trusty
+  # Strech (Ubuntu: xenial, yakkety, zesty, artful)
+  5.6:
+    debian: stretch
+    ubuntu: xenial
+  7.0:
+    debian: stretch
+    ubuntu: xenial
+  # Buster (Ubuntu: bionic, cosmic, disco, eoan)
+  7.1:
+    debian: buster
+    ubuntu: bionic
+  7.2:
+    debian: buster
+    ubuntu: bionic
+  # Bullseye (Ubuntu: focal, groovy, hirsute, impish)
+  7.3:
+    debian: bullseye
+    ubuntu: focal
+  7.4:
+    debian: bullseye
+    ubuntu: focal
+  8.0:
+    debian: bullseye
+    ubuntu: focal
+  8.1:
+    debian: bullseye
+    ubuntu: focal
+  8.2:
+    debian: bullseye
+    ubuntu: focal
+  all:
+    debian: bullseye
+    ubuntu: focal
 
 
 # -------------------------------------------------------------------------------------------------
@@ -54,9 +92,9 @@ directory_to_clean:
 apt_repositories_enabled:
   - backports
   - blackfire
-  - git
+  #- git
   - mongo
-  #- pgsql
+  - pgsql
 
 
 # -------------------------------------------------------------------------------------------------
@@ -156,75 +194,153 @@ software_enabled:
 #   pre:       [optional] Run custom command to add gpg key for repository
 #
 apt_repositories_available:
+  ###
+  ### Backports
+  ###
   backports:
+    # [Jessie]
     5.2:
       pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until
-      deb: deb http://archive.debian.org/debian jessie-backports main
+      deb: deb http://archive.debian.org/debian {{ os_release[5.2].debian }}-backports main
+    # [Jessie]
     5.3:
       pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until
-      deb: deb http://archive.debian.org/debian jessie-backports main
+      deb: deb http://archive.debian.org/debian {{ os_release[5.3].debian }}-backports main
+    # [Jessie]
     5.4:
       pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until
-      deb: deb http://archive.debian.org/debian jessie-backports main
+      deb: deb http://archive.debian.org/debian {{ os_release[5.4].debian }}-backports main
+    # [Jessie]
     5.5:
       pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until
-      deb: deb http://archive.debian.org/debian jessie-backports main
+      deb: deb http://archive.debian.org/debian {{ os_release[5.5].debian }}-backports main
+    # [Stretch]
+    5.6:
+      pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
+      deb: deb http://ftp.debian.org/debian {{ os_release[5.6].debian }}-backports main
+    # [Stretch]
+    7.0:
+      pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
+      deb: deb http://ftp.debian.org/debian {{ os_release[7.0].debian }}-backports main
+    # [Buster]
+    7.1:
+      pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
+      deb: deb http://ftp.debian.org/debian {{ os_release[7.1].debian }}-backports main
+    # [Buster]
+    7.2:
+      pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
+      deb: deb http://ftp.debian.org/debian {{ os_release[7.2].debian }}-backports main
+    # [Bullseye]
     all:
       pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
-      deb: deb http://ftp.debian.org/debian stretch-backports main
+      deb: deb http://ftp.debian.org/debian {{ os_release['all'].debian }}-backports main
+  ###
+  ### Blackfire
+  ###
   blackfire:
     all:
       deb: deb http://packages.blackfire.io/debian any main
       pre: curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+  ###
+  ### Git
+  ###
   git:
+    5.2:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[5.2].ubuntu }} main
+    5.3:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[5.3].ubuntu }} main
+    5.4:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[5.4].ubuntu }} main
+    5.5:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[5.5].ubuntu }} main
+    5.6:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[5.6].ubuntu }} main
+    7.0:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[7.0].ubuntu }} main
+    7.1:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[7.1].ubuntu }} main
     7.2:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[7.2].ubuntu }} main
     7.3:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[7.3].ubuntu }} main
     7.4:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[7.4].ubuntu }} main
     8.0:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[8.0].ubuntu }} main
     8.1:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[8.1].ubuntu }} main
     8.2:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[8.2].ubuntu }} main
     all:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main
       key: A1715D88E1DF1F24
-  # Get keys
-  # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-3.6.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
+  ###
+  ### MongoDB
+  ###
   mongo:
-    # 5.2 - 7.0: mongodb-clients / 7.1 - 7.2: mongo-tools / 7.3+: no mongo tools avail
-    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2]
-    # mongodb-org/4.4 buster is the first one with arm64 support
+    # 5.2: mongodb-clients (amd64)
+    # 5.3: mongodb-clients (amd64)
+    # 5.4: mongodb-clients (amd64)
+    # 5.5: mongodb-clients (amd64)
+    # 5.6: mongodb-clients & mongo-tools (amd64, arm64)
+    # 7.0: mongodb-clients & mongo-tools (amd64, arm64)
+    # 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+    # 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+    # 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+    # 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+    # 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+    # 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+    # 8.2: mongodb-org-(tools|shell) (amd64, arm64)
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0]
+    # [Buster] Ubuntu repository required for arm64 support instead
+    7.1:
+      # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-4.4.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
+      deb: deb http://repo.mongodb.org/apt/ubuntu {{ os_release[7.1].ubuntu }}/mongodb-org/4.4 multiverse
+      key: 20691EEC35216C63CAF66CE1656408E390CFB1F5
+    # [Buster] Ubuntu repository required for arm64 support instead
+    7.2:
+      # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-4.4.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
+      deb: deb http://repo.mongodb.org/apt/ubuntu {{ os_release[7.2].ubuntu }}/mongodb-org/4.4 multiverse
+      key: 20691EEC35216C63CAF66CE1656408E390CFB1F5
+    # [Bullseye] Ubuntu repository required for arm64 support instead
     all:
       # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-4.4.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
-      deb: deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main
+      deb: deb http://repo.mongodb.org/apt/ubuntu {{ os_release['all'].ubuntu }}/mongodb-org/4.4 multiverse
       key: 20691EEC35216C63CAF66CE1656408E390CFB1F5
+  ###
+  ### PostgrSQL
+  ###
   pgsql:
+    # [Jessie]
     5.2:
-      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main
+      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.2].debian }}-pgdg main
+    # [Jessie]
     5.3:
-      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main
+      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.3].debian }}-pgdg main
+    # [Jessie]
     5.4:
-      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main
+      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.4].debian }}-pgdg main
+    # [Jessie]
     5.5:
-      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main
+      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.5].debian }}-pgdg main
+    # [Stretch]
     5.6:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[5.6].debian }}-pgdg main
       pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+    # [Stretch]
     7.0:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[7.0].debian }}-pgdg main
       pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+    # [Buster]
     7.1:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[7.1].debian }}-pgdg main
       pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+    # [Buster]
     7.2:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[7.2].debian }}-pgdg main
       pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+    # [Bullseye]
     all:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release['all'].debian }}-pgdg main
       pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -