diff --git a/etc/modules.d/openmpi-pmi2.yaml b/etc/modules.d/openmpi-pmi2.yaml
index c310ec6..1b7883d 100644
--- a/etc/modules.d/openmpi-pmi2.yaml
+++ b/etc/modules.d/openmpi-pmi2.yaml
@@ -3,21 +3,7 @@ cli_arg: openmpi-pmi2
 help: Enable OpenMPI/PMI2 Support
 env: ENABLE_OPENMPI_PMI2
 conflicts: ["mpich", "cuda-mpi", "openmpi-pmix"]
+depends_on: ["pmi2"]
 shared_run: True
-additional_args:
-  - -e SLURM_*
-  - -e PALS_*
-  - -e PMI_*
-  - --ipc=host
-  - --network=host
-  - --pid=host
-  - --privileged
 bind:
-  - /dev/xpmem:/dev/xpmem
-  - /dev/shm:/dev/shm
-  - /dev/ss0:/dev/ss0
-  - /dev/cxi*:/dev/
-  - /var/spool/slurmd:/var/spool/slurmd
-  - /run/munge:/run/munge
-  - /run/nscd:/run/nscd
   - /etc/libibverbs.d:/etc/libibverbs.d
diff --git a/etc/modules.d/openmpi-pmix.yaml b/etc/modules.d/openmpi-pmix.yaml
index 789f370..3503afe 100644
--- a/etc/modules.d/openmpi-pmix.yaml
+++ b/etc/modules.d/openmpi-pmix.yaml
@@ -3,24 +3,7 @@ cli_arg: openmpi-pmix
 help: Enable OpenMPI/PMIx Support
 env: ENABLE_OPENMPI_PMIX
 conflicts: ["mpich", "cuda-mpi", "openmpi-pmi2"]
+depends_on: ["pmix"]
 shared_run: False
-additional_args:
-  - --userns=keep-id
-  - -e SLURM_*
-  - -e SLURMD_*
-  - -e PALS_*
-  - -e PMI_*
-  - -e PMIX_*
-  - --ipc=host
-  - --network=host
-  - --pid=host
-  - --privileged
 bind:
-  - /dev/xpmem:/dev/xpmem
-  - /dev/shm:/dev/shm
-  - /dev/ss0:/dev/ss0
-  - /dev/cxi*:/dev/
-  - /var/spool/slurmd:/var/spool/slurmd
-  - /run/munge:/run/munge
-  - /run/nscd:/run/nscd
   - /etc/libibverbs.d:/etc/libibverbs.d
diff --git a/etc/modules.d/pmi2.yaml b/etc/modules.d/pmi2.yaml
new file mode 100644
index 0000000..c6be159
--- /dev/null
+++ b/etc/modules.d/pmi2.yaml
@@ -0,0 +1,22 @@
+name: pmi2
+cli_arg: pmi2
+help: Enable PMI2 Support
+env: ENABLE_PMI2
+conflicts: ["mpich", "cuda-mpi", "pmix"]
+shared_run: True
+additional_args:
+  - -e SLURM_*
+  - -e PALS_*
+  - -e PMI_*
+  - --ipc=host
+  - --network=host
+  - --pid=host
+  - --privileged
+bind:
+  - /dev/xpmem:/dev/xpmem
+  - /dev/shm:/dev/shm
+  - /dev/ss0:/dev/ss0
+  - /dev/cxi*:/dev/
+  - /var/spool/slurmd:/var/spool/slurmd
+  - /run/munge:/run/munge
+  - /run/nscd:/run/nscd
diff --git a/etc/modules.d/pmix.yaml b/etc/modules.d/pmix.yaml
new file mode 100644
index 0000000..9270e53
--- /dev/null
+++ b/etc/modules.d/pmix.yaml
@@ -0,0 +1,25 @@
+name: pmix
+cli_arg: pmix
+help: Enable PMIx Support
+env: ENABLE_PMIX
+conflicts: ["mpich", "cuda-mpi", "pmi2"]
+shared_run: False
+additional_args:
+  - --userns=keep-id
+  - -e SLURM_*
+  - -e SLURMD_*
+  - -e PALS_*
+  - -e PMI_*
+  - -e PMIX_*
+  - --ipc=host
+  - --network=host
+  - --pid=host
+  - --privileged
+bind:
+  - /dev/xpmem:/dev/xpmem
+  - /dev/shm:/dev/shm
+  - /dev/ss0:/dev/ss0
+  - /dev/cxi*:/dev/
+  - /var/spool/slurmd:/var/spool/slurmd
+  - /run/munge:/run/munge
+  - /run/nscd:/run/nscd