diff --git a/utils/docker/images/Dockerfile.fedora-32 b/utils/docker/images/Dockerfile.fedora-32
index 2d765d30f4..d45ed8adb3 100644
--- a/utils/docker/images/Dockerfile.fedora-32
+++ b/utils/docker/images/Dockerfile.fedora-32
@@ -42,6 +42,7 @@ ARG PMDK_DEPS="\
 	man \
 	ndctl-devel \
 	pandoc \
+	python3 \
 	rpm-build \
 	rpm-build-libs \
 	rpmdevtools \
@@ -84,7 +85,6 @@ RUN dnf update -y \
 	${EXAMPLES_DEPS} \
 	${DOC_DEPS} \
 	${TESTS_DEPS} \
-	${COVERITY_DEPS} \
 	${MISC_DEPS} \
  && dnf clean all
 
diff --git a/utils/docker/images/Dockerfile.fedora-33 b/utils/docker/images/Dockerfile.fedora-33
index 782071737c..539a82b257 100644
--- a/utils/docker/images/Dockerfile.fedora-33
+++ b/utils/docker/images/Dockerfile.fedora-33
@@ -42,6 +42,7 @@ ARG PMDK_DEPS="\
 	man \
 	ndctl-devel \
 	pandoc \
+	python3 \
 	rpm-build \
 	rpm-build-libs \
 	rpmdevtools \
@@ -84,7 +85,6 @@ RUN dnf update -y \
 	${EXAMPLES_DEPS} \
 	${DOC_DEPS} \
 	${TESTS_DEPS} \
-	${COVERITY_DEPS} \
 	${MISC_DEPS} \
  && dnf clean all
 
diff --git a/utils/docker/images/Dockerfile.fedora-rawhide b/utils/docker/images/Dockerfile.fedora-rawhide
index b32ffb5c45..ad61b6c5a8 100644
--- a/utils/docker/images/Dockerfile.fedora-rawhide
+++ b/utils/docker/images/Dockerfile.fedora-rawhide
@@ -35,11 +35,6 @@ ARG LIBPMEMOBJ_CPP_DEPS="\
 	libpmemobj-devel \
 	tbb-devel"
 
-# pmem's Valgrind (optional; valgrind-devel may be used instead)
-ARG VALGRIND_DEPS="\
-	autoconf \
-	automake"
-
 # Examples (optional)
 ARG EXAMPLES_DEPS="\
 	ncurses-devel \
@@ -50,11 +45,14 @@ ARG DOC_DEPS="\
 	doxygen"
 
 # Tests (optional)
+# XXX: Valgrind is installed from upstream package, because of:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1903527
 ARG TESTS_DEPS="\
 	gdb \
 	libpmem-devel \
 	libunwind-devel \
-	pmempool"
+	pmempool \
+	valgrind-devel"
 
 # Misc for our builds/CI (optional)
 ARG MISC_DEPS="\
diff --git a/utils/docker/images/Dockerfile.ubuntu-18.04 b/utils/docker/images/Dockerfile.ubuntu-18.04
index d7d41d3de3..e17c03c091 100644
--- a/utils/docker/images/Dockerfile.ubuntu-18.04
+++ b/utils/docker/images/Dockerfile.ubuntu-18.04
@@ -51,7 +51,8 @@ ARG PMDK_DEPS="\
 	debhelper \
 	devscripts \
 	gdb \
-	pandoc"
+	pandoc \
+	python3"
 
 # pmem's Valgrind (optional; valgrind-devel may be used instead)
 ARG VALGRIND_DEPS="\
diff --git a/utils/docker/images/Dockerfile.ubuntu-20.04 b/utils/docker/images/Dockerfile.ubuntu-20.04
index d566ddfc36..5dd030e2ed 100644
--- a/utils/docker/images/Dockerfile.ubuntu-20.04
+++ b/utils/docker/images/Dockerfile.ubuntu-20.04
@@ -41,7 +41,8 @@ ARG PMDK_DEPS="\
 	gdb \
 	libdaxctl-dev \
 	libndctl-dev \
-	pandoc"
+	pandoc \
+	python3"
 
 # pmem's Valgrind (optional; valgrind-devel may be used instead)
 ARG VALGRIND_DEPS="\
@@ -97,6 +98,7 @@ RUN apt-get update \
 	${DOC_DEPS} \
 	${TESTS_DEPS} \
 	${CODECOV_DEPS} \
+	${COVERITY_DEPS} \
 	${MISC_DEPS} \
  && rm -rf /var/lib/apt/lists/*
 
diff --git a/utils/docker/images/Dockerfile.ubuntu-20.10 b/utils/docker/images/Dockerfile.ubuntu-20.10
index 217b89f370..c6e5afc20b 100644
--- a/utils/docker/images/Dockerfile.ubuntu-20.10
+++ b/utils/docker/images/Dockerfile.ubuntu-20.10
@@ -41,7 +41,8 @@ ARG PMDK_DEPS="\
 	gdb \
 	libdaxctl-dev \
 	libndctl-dev \
-	pandoc"
+	pandoc \
+	python3"
 
 # pmem's Valgrind (optional; valgrind-devel may be used instead)
 ARG VALGRIND_DEPS="\
diff --git a/utils/docker/images/Dockerfile.ubuntu-devel b/utils/docker/images/Dockerfile.ubuntu-devel
index bfa54c1160..225df664a3 100644
--- a/utils/docker/images/Dockerfile.ubuntu-devel
+++ b/utils/docker/images/Dockerfile.ubuntu-devel
@@ -40,7 +40,8 @@ ARG PMDK_DEPS="\
 	gdb \
 	libdaxctl-dev \
 	libndctl-dev \
-	pandoc"
+	pandoc \
+	python3"
 
 # pmem's Valgrind (optional; valgrind-devel may be used instead)
 ARG VALGRIND_DEPS="\