diff --git a/h/Hypre/Hypre-2.24.0-foss-2021a.eb b/h/Hypre/Hypre-2.24.0-foss-2021a.eb
new file mode 100644
index 00000000..28fa98c9
--- /dev/null
+++ b/h/Hypre/Hypre-2.24.0-foss-2021a.eb
@@ -0,0 +1,18 @@
+name = 'Hypre'
+version = '2.24.0'
+
+homepage = 'https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods'
+description = """Hypre is a library for solving large, sparse linear systems of equations on massively
+ parallel computers. The problems of interest arise in the simulation codes being developed at LLNL
+ and elsewhere to study physical phenomena in the defense, environmental, energy, and biological sciences."""
+
+toolchain = {'name': 'foss', 'version': '2021a'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/hypre-space/hypre/archive/']
+sources = ['v%(version)s.tar.gz']
+checksums = ['f480e61fc25bf533fc201fdf79ec440be79bb8117650627d1f25151e8be2fdb5']
+
+start_dir = 'src'
+
+moduleclass = 'numlib'
diff --git a/p/PETSc/PETSc-3.17.2-foss-2021a.eb b/p/PETSc/PETSc-3.17.2-foss-2021a.eb
index 10f97846..fb5df359 100644
--- a/p/PETSc/PETSc-3.17.2-foss-2021a.eb
+++ b/p/PETSc/PETSc-3.17.2-foss-2021a.eb
@@ -38,13 +38,13 @@ dependencies = [
 #    ('SCOTCH', '6.1.0'),
 #    ('MUMPS', '5.3.5', '-metis'),
 #    ('SuiteSparse', '5.8.1', '-METIS-5.1.0'),
-#    ('Hypre', '2.20.0'),
+    ('Hypre', '2.24.0'),
 ]
 
 # enabling --with-mpi4py seems to be totally broken, leads to make errors like:
 # No rule to make target 'mpi4py-build'
 configopts = '--LIBS="$LIBS -lrt" --with-mpi4py=0 --with-fortran=1 --download-scalapack '
-configopts += '--download-parmetis --download-metis --download-mumps=yes --download-hypre'
+configopts += '--download-parmetis --download-metis --download-mumps=yes'
 
 shared_libs = 1
 
diff --git a/p/PETSc/PETSc-3.17.2-foss-2021a.eb.bak_20220610082314_3032778 b/p/PETSc/PETSc-3.17.2-foss-2021a.eb.bak_20220610082314_3032778
deleted file mode 100644
index 1a6dd91f..00000000
--- a/p/PETSc/PETSc-3.17.2-foss-2021a.eb.bak_20220610082314_3032778
+++ /dev/null
@@ -1,55 +0,0 @@
-# IT4Innovations
-# LK JK
-
-name = 'PETSc'
-version = '3.17.2'
-
-homepage = 'https://www.mcs.anl.gov/petsc'
-description = """PETSc, pronounced PET-see (the S is silent), is a suite of data structures and routines for the
- scalable (parallel) solution of scientific applications modeled by partial differential equations."""
-
-toolchain = {'name': 'foss', 'version': '2021a'}
-import os
-if os.environ.get("CLUSTERNAME") in ["KAROLINA"]:
-   toolchainopts = {'openmp': True, 'usempi': True, 'optarch': 'march=core-avx2', 'pic': True}
-else:
-   toolchainopts = {'openmp': True, 'usempi': True, 'pic': True}
-
-source_urls = [
-    'https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/',
-    'ftp://ftp.mcs.anl.gov/pub/petsc/release-snapshots/',
-]
-sources = [SOURCELOWER_TAR_GZ]
-patches = [
-    'PETSc_ranlib-fix.patch',
-]
-checksums = [
-    '6151e438463c63ac0a2f9a7aae75e100',  # petsc-3.16.2.tar.gz
-    '64cf9d5008d5e92117e65bdec5316d991b6a6b8c8ecf7ea46eb790a498266297',  # PETSc_ranlib-fix.patch
-]
-
-builddependencies = [('CMake', '3.20.1')]
-
-dependencies = [
-    ('Python', '3.9.5'),
-    ('SciPy-bundle', '2021.05'),
-    ('Boost', '1.76.0'),
-#    ('METIS', '5.1.0'),
-#    ('SCOTCH', '6.1.0'),
-#    ('MUMPS', '5.3.5', '-metis'),
-#    ('SuiteSparse', '5.8.1', '-METIS-5.1.0'),
-#    ('Hypre', '2.20.0'),
-]
-
-# enabling --with-mpi4py seems to be totally broken, leads to make errors like:
-# No rule to make target 'mpi4py-build'
-configopts = '--LIBS="$LIBS -lrt" --with-mpi4py=0 --with-fortran=1 --download-scalapack '
-configopts += '--download-parmetis --download-metis --download-mumps=yes --download-hypre'
-
-shared_libs = 1
-
-# only required when building PETSc in a SLURM job environment
-# configopts += '--with-batch=1 --known-mpi-shared-libraries=1 --known-64-bit-blas-indices=0 '
-# prebuildopts = "srun ./conftest-arch-linux2-c-opt && ./reconfigure-arch-linux2-c-opt.py && "
-
-moduleclass = 'numlib'