diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm
index a1df844..a042c9a 100644
--- a/glicid/packages/cluster.scm
+++ b/glicid/packages/cluster.scm
@@ -48,5 +48,5 @@
      `(#:configure-flags (list (string-append "--enable-snmp")
                                (string-append "--enable-snmp-checker")
                                (string-append "--enable-snmp-rfc"))))
-    (inputs `(("net-snmp" ,net-snmp)
-              ,@(package-inputs keepalived-latest)))))
+    (inputs (modify-inputs (package-inputs keepalived-latest)
+              (prepend net-snmp)))))
diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm
index 3265ed9..8eb1f86 100644
--- a/glicid/packages/linux.scm
+++ b/glicid/packages/linux.scm
@@ -180,10 +180,10 @@
               (sha256
                (base32
                 "1k8h7sa16gdhilkf0bw65xmv8c5dk13szc3rw56hd1nwm42k1yna"))))
-    (inputs `(("util-linux:lib" ,util-linux "lib")
-              ;; uuid.h, numa.h
-              ("numactl" ,gnu:numactl)
-              ,@(package-inputs gnu:libfabric)))))
+    (inputs (modify-inputs (package-inputs gnu:libfabric)
+              (prepend `(,util-linux "lib")
+                       ;; uuid.h, numa.h
+                       gnu:numactl)))))
 
 (define-public libfabric-upstream-1.16.0
   (package
@@ -198,10 +198,10 @@
               (sha256
                (base32
                 "1lk7abv919bc24ak0yr509bdh8dn83sf6ab326kbvs1wdsfln45c"))))
-    (inputs `(("util-linux:lib" ,util-linux "lib")
-              ;; uuid.h, numa.h
-              ("numactl" ,gnu:numactl)
-              ,@(package-inputs gnu:libfabric)))))
+    (inputs (modify-inputs (package-inputs gnu:libfabric)
+              (prepend `(,util-linux "lib")
+                       ;; uuid.h, numa.h
+                       gnu:numactl)))))
 
 (define-public libfabric-upstream-1.16.1
   (package
@@ -216,10 +216,10 @@
               (sha256
                (base32
                 "0gqr7765za14kalwws2brw8l6zw80iai0ggaljw99zls7z9r5yak"))))
-    (inputs `(("util-linux:lib" ,util-linux "lib")
-              ;; uuid.h, numa.h
-              ("numactl" ,gnu:numactl)
-              ,@(package-inputs gnu:libfabric)))))
+    (inputs (modify-inputs (package-inputs gnu:libfabric)
+              (prepend `(,util-linux "lib")
+                       ;; uuid.h, numa.h
+                       gnu:numactl)))))
 
 (define local-libfabric
   libfabric-upstream-1.16.1)
diff --git a/glicid/packages/parallel.scm b/glicid/packages/parallel.scm
index 266915b..633a5db 100644
--- a/glicid/packages/parallel.scm
+++ b/glicid/packages/parallel.scm
@@ -41,9 +41,8 @@
     (description "MPIX. More to come. FIXIT")
     (home-page "https://www.gnu.org/software/hello/")
     (license license:gpl3+)
-    (inputs `(("libevent" ,libevent)
-              ("hwloc" ,hwloc-2 "lib")
-              ("perl" ,perl)))))
+    (inputs (list libevent
+                  `(,hwloc-2 "lib") perl))))
 
 (define-public openpmix-4.1.0
   (package
@@ -57,10 +56,8 @@
               (sha256
                (base32
                 "0bl4gkh87csm3yh418wvrih35mg6swavcxj78gyb7gr1qsk0apql"))))
-    (inputs `(("python" ,python)
-              ("zlib" ,zlib)
-              ("pandoc" ,pandoc)
-              ,@(package-inputs openpmix-3.1.5)))))
+    (inputs (modify-inputs (package-inputs openpmix-3.1.5)
+              (prepend python zlib pandoc)))))
 
 (define-public openpmix
   openpmix-4.1.0)
@@ -86,8 +83,8 @@
   (package
     (inherit slurm-20.02-latest)
     (name "slurm-glicid")
-    (inputs `(("gtk+-2" ,gtk+-2)
-              ("mariadb:dev" ,mariadb "dev")
+    (inputs `(("gtk+" ,gtk+-2)
+              ("mariadb" ,mariadb "dev")
               ,@(package-inputs slurm-20.02-latest)))))
 
 (define-public slurm-20.11-upstream
@@ -113,8 +110,8 @@
   (package
     (inherit slurm-20.11-latest)
     (name "slurm-glicid")
-    (inputs `(("gtk+-2" ,gtk+-2)
-              ("mariadb:dev" ,mariadb "dev")
+    (inputs `(("gtk+" ,gtk+-2)
+              ("mariadb" ,mariadb "dev")
               ,@(package-inputs slurm-20.11-latest)))))
 
 (define-public slurm-21.08-upstream
@@ -137,8 +134,8 @@
   (package
     (inherit slurm-21.08-latest)
     (name "slurm-glicid")
-    (inputs `(("gtk+-2" ,gtk+-2)
-              ("mariadb:dev" ,mariadb "dev")
+    (inputs `(("gtk+" ,gtk+-2)
+              ("mariadb" ,mariadb "dev")
               ,@(package-inputs slurm-21.08-latest)))))
 
 (define-public slurm-22.05-upstream
@@ -161,8 +158,8 @@
   (package
     (inherit slurm-22.05-latest)
     (name "slurm-glicid")
-    (inputs `(("gtk+-2" ,gtk+-2)
-              ("mariadb:dev" ,mariadb "dev")
+    (inputs `(("gtk+" ,gtk+-2)
+              ("mariadb" ,mariadb "dev")
               ,@(package-inputs slurm-22.05-latest)))))
 
 (define-public slurm-23.02-upstream
@@ -188,13 +185,13 @@
   (package
     (inherit slurm-23.02-latest)
     (name "slurm-glicid")
-    (inputs `(("gtk+-2" ,gtk+-2)
-              ("mariadb:dev" ,mariadb "dev")
-              ("ucx" ,ucx-latest-glicid) ;not autotested by config
-              ("podman" ,podman)
-              ("lua" ,lua)
-              ("lz4" ,lz4)
-              ,@(package-inputs slurm-23.02-latest)))))
+    (inputs (modify-inputs (package-inputs slurm-23.02-latest)
+              (prepend gtk+-2
+                       `(,mariadb "dev")
+                       ucx-latest-glicid ;not autotested by config
+                       podman
+                       lua
+                       lz4)))))
 
 (define-public slurm-glicid
   slurm-22.05-glicid)
@@ -205,5 +202,3 @@
 (define-public slurm-glicid-test
   slurm-23.02-glicid)
 
-slurm-glicid-test
-