diff --git a/glicid/packages/parallel.scm b/glicid/packages/parallel.scm
index c42826e..c28b450 100644
--- a/glicid/packages/parallel.scm
+++ b/glicid/packages/parallel.scm
@@ -12,6 +12,7 @@
   #:use-module (gnu packages mpi)
   #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages databases)
+  #:use-module (glicid utils)
 )
 
 (define-public openpmix-3.1.5
@@ -67,10 +68,10 @@
 
 (define-public openpmix openpmix-4.1.0)
 
-(define-public slurm-20.02-glicid
-  (package 
+(define-public slurm-20.02-upstream
+ (package 
     (inherit slurm-20.02)
-    (name "slurm-glicid")
+    (name "slurm-upstream")
     (version "20.02.7")
     (source 
       (origin
@@ -80,28 +81,90 @@
         (sha256 (base32 "1khlv69q41chgkcs1i7l651hvyx8sz3j9yhjbgky3gpqrgrmz1h6"))
       )
     )
+  )
+)
+
+(define slurm-20.02-latest
+ (latest-version slurm-20.02 slurm-20.02-upstream)
+)
+
+(define-public slurm-20.02-glicid
+  (package 
+    (inherit slurm-20.02-latest)
+    (name "slurm-glicid")
     (inputs `(
       ("gtk+-2", gtk+-2)
       ("mariadb:dev", mariadb "dev")
-      ,@(package-inputs slurm-20.02)
+      ,@(package-inputs slurm-20.02-latest)
     ))
   )
 )
 
+(define-public slurm-20.11-upstream
+ (package 
+    (inherit slurm-20.11)
+    (name "slurm-upstream")
+    (version "20.11.9")
+    (source 
+      (origin
+        (inherit (package-source slurm-20.11))
+        (method url-fetch)
+        (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2"))
+	(sha256 (base32 "0xq2d6dm285y541dyg1h66z7svsisrq8c81ag0f601xz1cn3mq9m"))
+
+      )
+    )
+  )
+)
+
+(define slurm-20.11-latest
+ (latest-version slurm-20.11 slurm-20.11-upstream)
+)
+
 (define-public slurm-20.11-glicid
   (package 
-    (inherit slurm-20.02-glicid)
+    (inherit slurm-20.11-latest)
     (name "slurm-glicid")
-    (version "20.11.9")
+    (inputs `(
+      ("gtk+-2", gtk+-2)
+      ("mariadb:dev", mariadb "dev")
+      ,@(package-inputs slurm-20.11-latest)
+    ))
+  )
+)
+
+
+(define-public slurm-21.08-upstream
+ (package 
+    (inherit slurm)
+    (name "slurm-upstream")
+    (version "21.08.8-2")
     (source 
       (origin
         (method url-fetch)
         (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2"))
         (sha256 (base32 "0xq2d6dm285y541dyg1h66z7svsisrq8c81ag0f601xz1cn3mq9m"))
       )
-    )
+    ) 
   )
 )
 
-(define-public slurm-glicid slurm-20.11-glicid)
+(define slurm-21.08-latest
+ (latest-version slurm slurm-21.08-upstream)
+)
+
+(define-public slurm-21.08-glicid
+  (package 
+    (inherit slurm-21.08-latest)
+    (name "slurm-glicid")
+    (inputs `(
+      ("gtk+-2", gtk+-2)
+      ("mariadb:dev", mariadb "dev")
+      ,@(package-inputs slurm-21.08-latest)
+    ))
+  )
+)
+
+
+(define-public slurm-glicid slurm-21.08-glicid)
 (define-public slurm-ccipl slurm-20.11-glicid)