diff --git a/Dockerfile b/Dockerfile
index db92d7f9a91..522a2e731e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 	automake \
 	autopoint \
 	bash \
+	bash-completion \
 	bc \
 	bison \
 	build-essential \
@@ -32,8 +33,10 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 	g++-multilib \
 	gawk \
 	gettext \
+	gh \
 	git \
 	gperf \
+	httpie \
 	imagemagick \
 	intltool \
 	jq \
@@ -51,7 +54,11 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 	libtool \
 	libunistring-dev \
 	lzip \
+	man-db \
+	manpages-dev \
 	mercurial \
+	meson \
+	mlocate \
 	moreutils \
 	ninja-build \
 	patchelf \
@@ -60,7 +67,10 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 	python2 \
 	python3 \
 	python3-distutils \
+	python3-pip \
+	python3-virtualenv \
 	rename \
+	ripgrep \
 	rsync \
 	ruby-mustache \
 	scons \
@@ -68,6 +78,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 	sudo \
 	swig \
 	texinfo \
+	time \
+	tree \
 	unzip \
 	xmlto \
 	zip \
@@ -78,18 +90,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 	adduser user sudo && \
 	echo "%user ALL=(ALL:ALL) NOPASSWD: ALL" | sudo tee /etc/sudoers.d/users
 
-# Install setuptools, wheel and pip for Python2
-RUN wget https://bootstrap.pypa.io/pip/2.7/get-pip.py -O - | python2
-# Install virtualenv and httpie for Python2
-# Use pip2 as default pip -> python3
-RUN pip2 install virtualenv httpie
-
-# Install setuptools, wheel and pip for Python3
-# Default pip -> python3 aware for native python wheels builds
-RUN wget https://bootstrap.pypa.io/get-pip.py -O - | python3
-# Install meson cross-platform build system
-RUN pip3 install meson==1.0.0
-
 # Volume pointing to spksrc sources
 VOLUME /spksrc
 WORKDIR /spksrc