diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index 5e3f4c8ee2..8b492aee59 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -356,6 +356,12 @@ fail_msg="Installation of WRF failed, that's unexpected..."
 OMPI_MCA_pml=ucx UCX_TLS=tcp $EB WRF-3.9.1.1-foss-2020a-dmpar.eb -r --include-easyblocks-from-pr 2648
 check_exit_code $? "${ok_msg}" "${fail_msg}"
 
+echo ">>Installing Snakemake 17.8.1..."
+ok_msg="Snakemake installed, tame those snakes!"
+fail_msg="Installation of Snakemake failed, that's unexpected..."
+$EB -r --from-pr 16579 snakemake-7.18.1-foss-2020a-Python-3.8.2.eb
+check_exit_code $? "${ok_msg}" "${fail_msg}"
+
 ### add packages here
 
 echo ">> Creating/updating Lmod cache..."
diff --git a/eessi-2021.12.yml b/eessi-2021.12.yml
index f3ed9dd9c4..ab2a7ab05e 100644
--- a/eessi-2021.12.yml
+++ b/eessi-2021.12.yml
@@ -53,3 +53,9 @@ software:
          versions: 
            '3.9.1.1': 
              versionsuffix: -dmpar
+  snakemake:
+     toolchains:
+       foss-2020a:
+         versions: 
+           '17.8.1': 
+            versionsuffix: -Python-3.8.2