diff --git a/dockerfiles/pyopenms/manylinux/Dockerfile b/dockerfiles/pyopenms/manylinux/Dockerfile
index 94c5770..a0005b7 100644
--- a/dockerfiles/pyopenms/manylinux/Dockerfile
+++ b/dockerfiles/pyopenms/manylinux/Dockerfile
@@ -1,38 +1,52 @@
 FROM quay.io/pypa/manylinux2014_x86_64
-
-#defaults, can be overwritten from outside
-ARG OPENMS_BRANCH="master" 
+ARG CONTRIB_BUILD_DIR="/contrib-build"
 ARG OPENMS_VERSION="latest"
 
 # make source files from context available in docker
 COPY . /contrib
 
-RUN yum install -y wget
-RUN yum install -y xz qt5-qtbase-devel 
-RUN yum install -y qt5-qtbase-devel qt5-qtsvg qt5-qtsvg-devel python-devel 
-# RUN yum install -y libsvm-devel glpk-devel libzip-devel zlib-devel xerces-c-devel bzip2-devel sqlite-devel hdf5-devel
-RUN yum install -y libtool
+RUN yum install -y \
+    # build system dependencies
+    wget \
+    xz \
+    libtool \
+    cmake3 \
+    # OpenMS and PyOpenMS build dependencies
+    libsvm-devel \
+    glpk-devel \
+    libzip-devel \
+    zlib-devel \
+    xerces-c-devel \
+    bzip2-devel \
+    hdf5-devel \
+    qt5-qtbase-devel \
+    qt5-qtsvg-devel \
+    eigen3-devel \
+    python-devel
+# TODO: do we need sqlite-devel?
+# TODO: can we install boost from yum?
+# TODO: is coin-or-CoinUtils-devel useful?
+# TODO: do we need KissFFT? It's not installed in the regular contrib Dockerfile
 
-RUN yum install -y cmake3
 RUN ln -s /usr/bin/cmake3 /usr/bin/cmake
 
 # builds contrib for the current checked out branch
 # during cleanup: removes archives
-RUN mkdir contrib-build
-RUN ls -l
-WORKDIR /contrib-build
-RUN ls -l
-RUN cmake -DBUILD_TYPE=ALL ../contrib && rm -rf archives src
-    
+WORKDIR ${CONTRIB_BUILD_DIR}
+RUN cmake -DBUILD_TYPE="BOOST;COINOR;KISSFFT;OPENMP" ../contrib && rm -rf archives src
+
 WORKDIR /
 
 # Metadata
 LABEL base.image="manylinux2014_x86_64"
-LABEL version="1.0"
+LABEL version="${OPENMS_VERSION}"
 LABEL software="OpenMS (dependencies for manylinux2014)"
-LABEL software.version="$OPENMS_VERSION"
-LABEL description="C++ libraries and tools for MS/MS data analysis"
-LABEL website="http://www.openms.org/"
-LABEL documentation="http://www.openms.org/"
-LABEL license="http://www.openms.org/"
+LABEL software.version="$OPENMS_VERSION-manylinux2014"
+LABEL description="Base image to build OpenMS: C++ libraries and tools for MS/MS data analysis"
+LABEL website="https://www.openms.org/"
+LABEL documentation="https://www.openms.org/"
+LABEL license="https://www.openms.org/"
 LABEL tags="Proteomics"
+
+# to link to repo on github container registry
+LABEL org.opencontainers.image.source https://github.com/OpenMS/contrib