diff --git a/packages/mpi/openmpi/openmpi-4.0.2 b/packages/mpi/openmpi/openmpi-4.0.2
index 5915671..2c34038 100755
--- a/packages/mpi/openmpi/openmpi-4.0.2
+++ b/packages/mpi/openmpi/openmpi-4.0.2
@@ -28,6 +28,11 @@ CONFIGURE_OPTS="
 	--enable-mpi-thread-multiple \
         "
 
+if [ ! -z "$UCX_DIR" ]
+then
+    CONFIGURE_OPTS+=" --with-ucx=$UCX_DIR"
+fi
+
 src_pretest() {
     make check
 }
diff --git a/packages/mpi/openmpi/openmpi-4.0.3 b/packages/mpi/openmpi/openmpi-4.0.3
index ee3bf1c..0b2c888 100755
--- a/packages/mpi/openmpi/openmpi-4.0.3
+++ b/packages/mpi/openmpi/openmpi-4.0.3
@@ -25,12 +25,11 @@ HASH_SHA1=
 CONFIGURE_OPTS="
         --enable-shared \
         --enable-static \
-	--enable-mpi-thread-multiple \
         "
 
 if [ ! -z "$UCX_DIR" ]
 then
-    CONFIGURE_OPTS+=" --with-ucx=$UCX_DIR"
+    CONFIGURE_OPTS+=" --with-ucx=$UCX_DIR --without-verbs"
 fi
 
 src_pretest() {
diff --git a/packages/mpi/openmpi/openmpi-4.0.5 b/packages/mpi/openmpi/openmpi-4.0.5
index a6c4da8..08bac7c 100755
--- a/packages/mpi/openmpi/openmpi-4.0.5
+++ b/packages/mpi/openmpi/openmpi-4.0.5
@@ -22,16 +22,32 @@ HASH_SHA1=
 # --enable-mpi-fortran=usempif08 \
 # --with-devel-headers \
 # --enable-contrib-no-build=vt
+# FFLAGS=-I/ \
 CONFIGURE_OPTS="
         --enable-shared \
         --enable-static \
 	--without-verbs \
         "
 
+if [ "$COMPILER" == "aocc" ] ; then 
+    CONFIGURE_OPTS+=" --enable-mpi-ext=no"
+fi
+
 if [ ! -z "$UCX_DIR" ] ; then
     CONFIGURE_OPTS+=" --with-ucx=$UCX_DIR"
 fi
 
+if [ ! -z "$HCOLL_DIR" ] ; then
+    CONFIGURE_OPTS+=" --with-hcoll=$HCOLL_DIR"
+fi
+
+if [ ! -z "$KNEM_DIR" ] ; then
+    CONFIGURE_OPTS+=" --with-knem=$KNEM_DIR"
+fi
+if [ ! -z "$PBS_DIR" ] ; then
+    CONFIGURE_OPTS+=" --with-tm=$PBS_DIR"
+fi
+
 if [ ! -z $CUDA_DIR ] ; then
     [ -z "$UCX_DIR" ] && sit_fail "Have to be configured with external UCX"
     ucx_info -b | grep -e "HAVE_CUDA *1" >/dev/null || sit_fail "UCX must be built with CUDA support"
diff --git a/packages/mpi/openmpi/openmpi-4.1.0 b/packages/mpi/openmpi/openmpi-4.1.0
new file mode 100755
index 0000000..1fa1aa2
--- /dev/null
+++ b/packages/mpi/openmpi/openmpi-4.1.0
@@ -0,0 +1,59 @@
+#!/bin/sh
+# sit class file
+#
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2020
+#
+
+CATEGORY="mpi"
+PACKAGE="openmpi"
+VERSION="4.1.0"
+URL="http://www.open-mpi.org"
+INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
+
+# Archive A and package name P
+A="$PACKAGE-$VERSION.tar.bz2"
+P="$PACKAGE-$VERSION"
+HASH_MD5=
+HASH_SHA1=
+
+# Other interesting configure options:
+# --enable-mpi-threads
+# --enable-progress-threads
+# --enable-mpi-fortran=usempif08 \
+# --with-devel-headers \
+# --enable-contrib-no-build=vt
+# FFLAGS=-I/ \
+CONFIGURE_OPTS="
+        --enable-shared \
+        --enable-static \
+	--without-verbs \
+        "
+
+if [ "$COMPILER" == "aocc" ] ; then 
+    CONFIGURE_OPTS+=" --enable-mpi-ext=no"
+fi
+
+if [ ! -z "$UCX_DIR" ] ; then
+    CONFIGURE_OPTS+=" --with-ucx=$UCX_DIR"
+fi
+
+if [ ! -z "$HCOLL_DIR" ] ; then
+    CONFIGURE_OPTS+=" --with-hcoll=$HCOLL_DIR"
+fi
+
+if [ ! -z "$KNEM_DIR" ] ; then
+    CONFIGURE_OPTS+=" --with-knem=$KNEM_DIR"
+fi
+if [ ! -z "$PBS_DIR" ] ; then
+    CONFIGURE_OPTS+=" --with-tm=$PBS_DIR"
+fi
+
+if [ ! -z $CUDA_DIR ] ; then
+    [ -z "$UCX_DIR" ] && sit_fail "Have to be configured with external UCX"
+    ucx_info -b | grep -e "HAVE_CUDA *1" >/dev/null || sit_fail "UCX must be built with CUDA support"
+    CONFIGURE_OPTS+=" --with-cuda=$CUDA_DIR"
+fi
+
+src_pretest() {
+    make check
+}
diff --git a/packages/mpi/openmpi/openmpi-4.1.1 b/packages/mpi/openmpi/openmpi-4.1.1
new file mode 100755
index 0000000..54ca35d
--- /dev/null
+++ b/packages/mpi/openmpi/openmpi-4.1.1
@@ -0,0 +1,59 @@
+#!/bin/sh
+# sit class file
+#
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2021
+#
+
+CATEGORY="mpi"
+PACKAGE="openmpi"
+VERSION="4.1.1"
+URL="http://www.open-mpi.org"
+INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
+
+# Archive A and package name P
+A="$PACKAGE-$VERSION.tar.bz2"
+P="$PACKAGE-$VERSION"
+HASH_MD5=
+HASH_SHA1=
+
+# Other interesting configure options:
+# --enable-mpi-threads
+# --enable-progress-threads
+# --enable-mpi-fortran=usempif08 \
+# --with-devel-headers \
+# --enable-contrib-no-build=vt
+# FFLAGS=-I/ \
+CONFIGURE_OPTS="
+        --enable-shared \
+        --enable-static \
+	--without-verbs \
+        "
+
+if [ "$COMPILER" == "aocc" ] ; then 
+    CONFIGURE_OPTS+=" --enable-mpi-ext=no"
+fi
+
+if [ ! -z "$UCX_DIR" ] ; then
+    CONFIGURE_OPTS+=" --with-ucx=$UCX_DIR"
+fi
+
+if [ ! -z "$HCOLL_DIR" ] ; then
+    CONFIGURE_OPTS+=" --with-hcoll=$HCOLL_DIR"
+fi
+
+if [ ! -z "$KNEM_DIR" ] ; then
+    CONFIGURE_OPTS+=" --with-knem=$KNEM_DIR"
+fi
+if [ ! -z "$PBS_DIR" ] ; then
+    CONFIGURE_OPTS+=" --with-tm=$PBS_DIR"
+fi
+
+if [ ! -z $CUDA_DIR ] ; then
+    [ -z "$UCX_DIR" ] && sit_fail "Have to be configured with external UCX"
+    ucx_info -b | grep -e "HAVE_CUDA *1" >/dev/null || sit_fail "UCX must be built with CUDA support"
+    CONFIGURE_OPTS+=" --with-cuda=$CUDA_DIR"
+fi
+
+src_pretest() {
+    make check
+}
diff --git a/packages/mpi/openmpi/openmpi-4.1.2 b/packages/mpi/openmpi/openmpi-4.1.2
new file mode 100755
index 0000000..61fb232
--- /dev/null
+++ b/packages/mpi/openmpi/openmpi-4.1.2
@@ -0,0 +1,59 @@
+#!/bin/sh
+# sit class file
+#
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2021
+#
+
+CATEGORY="mpi"
+PACKAGE="openmpi"
+VERSION="4.1.2"
+URL="http://www.open-mpi.org"
+INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
+
+# Archive A and package name P
+A="$PACKAGE-$VERSION.tar.bz2"
+P="$PACKAGE-$VERSION"
+HASH_MD5=
+HASH_SHA1=
+
+# Other interesting configure options:
+# --enable-mpi-threads
+# --enable-progress-threads
+# --enable-mpi-fortran=usempif08 \
+# --with-devel-headers \
+# --enable-contrib-no-build=vt
+# --enable-static \
+# --enable-shared \
+# FFLAGS=-I/ \
+CONFIGURE_OPTS="
+	--without-verbs \
+        "
+
+if [ "$COMPILER" == "aocc" ] ; then 
+    CONFIGURE_OPTS+=" --enable-mpi-ext=no"
+fi
+
+if [ ! -z "$UCX_DIR" ] ; then
+    CONFIGURE_OPTS+=" --with-ucx=$UCX_DIR"
+fi
+
+if [ ! -z "$HCOLL_DIR" ] ; then
+    CONFIGURE_OPTS+=" --with-hcoll=$HCOLL_DIR"
+fi
+
+if [ ! -z "$KNEM_DIR" ] ; then
+    CONFIGURE_OPTS+=" --with-knem=$KNEM_DIR"
+fi
+if [ ! -z "$PBS_DIR" ] ; then
+    CONFIGURE_OPTS+=" --with-tm=$PBS_DIR"
+fi
+
+if [ ! -z $CUDA_DIR ] ; then
+    [ -z "$UCX_DIR" ] && sit_fail "Have to be configured with external UCX"
+    ucx_info -b | grep -e "HAVE_CUDA *1" >/dev/null || sit_fail "UCX must be built with CUDA support"
+    CONFIGURE_OPTS+=" --with-cuda=$CUDA_DIR"
+fi
+
+src_pretest() {
+    make check
+}