diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm
index ed09b88..9e02c3b 100644
--- a/glicid/packages/mpi.scm
+++ b/glicid/packages/mpi.scm
@@ -10,21 +10,6 @@
   #:use-module (glicid packages parallel)
   #:use-module (gnu packages))
 
-(define-public openmpi-upstream-4.1.2
-  (package
-    (inherit gnu:openmpi)
-    (name "openmpi-upstream")
-    (version "4.1.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://www.open-mpi.org/software/ompi/v"
-                                  (version-major+minor version)
-                                  "/downloads/openmpi-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "09xmlr4mfs02kwcf5cmdgkcdjj81fjwjmpa3rz2k28f3gz7wfy4v"))
-              (patches (search-patches "openmpi-mtl-priorities.patch"))))))
-
 (define-public openmpi-upstream-4.1.4
   (package
     (inherit gnu:openmpi)
@@ -46,31 +31,19 @@
 (define-public openmpi-latest
   (latest-version local-openmpi gnu:openmpi))
 
-(define-public openmpi-glicid
+(define openmpi-slurm-glicid
   (package
     (inherit (transform-package ((instead-of "slurm" slurm-glicid)
                                  openmpi-latest) "glicid"))))
 
 (define openmpi-glicid-libfabric
   (transform-package ((instead-of "libfabric" libfabric-latest)
-                      openmpi-glicid) "libfabric"))
-
-;(define-public openmpi-glicid-rdma
-;  (transform-package ((instead-of "rdma-core" rdma-core-latest) openmpi-glicid) "rdma-core")
-;)
-
-;(define-public openmpi-glicid-ucx
-;  (transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid) "ucx" )
-;)
+                      openmpi-slurm-glicid) "libfabric"))
 
 (define openmpi-glicid-libfabric-rdma
   (transform-package ((instead-of "rdma-core" rdma-core-latest)
                       openmpi-glicid-libfabric) "rdma"))
 
-;(define-public openmpi-glicid-libfabric-ucx
-;  (transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid-libfabric) "ucx")
-;)
-
 (define openmpi-glicid-libfabric-rdma-ucx
   (transform-package ((instead-of "ucx" ucx-latest-glicid)
                       openmpi-glicid-libfabric-rdma) "ucx"))
@@ -79,6 +52,8 @@
   (transform-package ((instead-of "psm2" psm2-latest)
                       openmpi-glicid-libfabric-rdma-ucx) "psm2"))
 
+(define-public openmpi-glicid openmpi-glicid-libfabric-rdma-ucx-psm2)
+
 (define-public openmpi-glicid-waves
   (package
     (inherit (transform-package ((instead-of "slurm-glicid" slurm-ccipl)