diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-mvapich-2.3.6 b/definition-files/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-mvapich-2.3.6
new file mode 100644
index 0000000000000000000000000000000000000000..37747d64c061e4661822fed172781a7ee5c3791c
--- /dev/null
+++ b/definition-files/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-mvapich-2.3.6
@@ -0,0 +1,87 @@
+Bootstrap: oras
+From: ghcr.io/mkandes/naked-singularity:ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0
+
+%labels
+
+    APPLICATION_NAME ubuntu + mlnx-ofed + mvapich
+    APPLICATION_VERSION 18.04 + 4.7-3.2.9.0 + 2.3.6
+    APPLICATION_URL https://mvapich.cse.ohio-state.edu
+
+    AUTHOR_NAME Marty Kandes
+    AUTHOR_EMAIL mkandes@sdsc.edu
+
+    LAST_UPDATED 20210805
+
+%setup
+
+%environment
+
+    # Set MVAPICH major, minor, and revision numbers, root and
+    # installation directories
+    export MV_ROOT_URL='http://mvapich.cse.ohio-state.edu/download/mvapich'
+    export MV_MAJOR='2'
+    export MV_MINOR='3'
+    export MV_REVISION='6'
+    export MV_VERSION="${MV_MAJOR}.${MV_MINOR}.${MV_REVISION}"
+    export MV_ROOT_DIR='/opt/mvapich'
+    export MV_INSTALL_DIR="${MV_ROOT_DIR}/${MV_VERSION}"
+
+    # Set paths to MVAPICH binaries and libraries
+    export PATH="${MV_INSTALL_DIR}/bin:${PATH}"
+    export LD_LIBRARY_PATH="${MV_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}"
+
+%post -c /bin/bash
+
+    # Set operating system mirror URL
+    export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
+
+    # Set operating system version
+    export OSVERSION='bionic'
+
+    # Set system locale
+    export LC_ALL='C'
+
+    # Set debian frontend interface
+    export DEBIAN_FRONTEND='noninteractive'
+
+    # Upgrade all software packages to their latest versions
+    apt-get -y update && apt-get -y upgrade
+
+    # Set MVAPICH major, minor, and revision numbers, root and
+    # installation directories
+    export MV_ROOT_URL='http://mvapich.cse.ohio-state.edu/download/mvapich'
+    export MV_MAJOR='2'
+    export MV_MINOR='3'
+    export MV_REVISION='6'
+    export MV_VERSION="${MV_MAJOR}.${MV_MINOR}.${MV_REVISION}"
+    export MV_ROOT_DIR='/opt/mvapich'
+    export MV_INSTALL_DIR="${MV_ROOT_DIR}/${MV_VERSION}"
+
+    cd /tmp
+
+    # Download, build, and install MVAPICH
+    wget "${MV_ROOT_URL}/mv${MV_MAJOR}/mvapich${MV_MAJOR}-${MV_VERSION}.tar.gz"
+    tar -xf "mvapich${MV_MAJOR}-${MV_VERSION}.tar.gz"
+    cd "mvapich${MV_MAJOR}-${MV_VERSION}"
+    ./configure --prefix="${MV_INSTALL_DIR}"
+    make
+    make install
+
+    cd /tmp
+
+    # Remove MVAPICH build directory and source tarball
+    rm -rf "mvapich${MV_MAJOR}-${MV_VERSION}"
+    rm "mvapich${MV_MAJOR}-${MV_VERSION}.tar.gz"
+
+    # Cleanup
+    apt-get -y autoremove --purge
+    apt-get -y clean
+
+    # Update database for mlocate
+    updatedb
+
+%files
+
+%runscript
+
+%test