diff --git a/Custom_Hooks/eb_hooks.py b/Custom_Hooks/eb_hooks.py
index 135c29d6d1c60242a2d56a6179543c17e4690aa4..d1ff1912bfcf57843670d17eb22a9cf234e2bbbe 100644
--- a/Custom_Hooks/eb_hooks.py
+++ b/Custom_Hooks/eb_hooks.py
@@ -463,7 +463,8 @@ def pre_ready_hook(self, *args, **kwargs):
     # overridden, only experts should know that)
     override_mpi_check = os.getenv("JSC_OVERRIDE_MPI_CHECK")
     if not override_mpi_check:
-        if is_mpi and GOLDEN_REPO not in path_to_ec and os.getenv('USER') not in 'swmanage':
+        if is_mpi and GOLDEN_REPO not in path_to_ec and 'Overlays' not in path_to_ec \
+        and os.getenv('USER') not in 'swmanage':
             print_warning(
                 "\nYou are attempting to install a non-system MPI implementation (%s), "
                 "this is very likely to lead to severe performance degradation. Please "
diff --git a/Golden_Repo/a/Autoconf/Autoconf-2.69-GCCcore-11.2.0.eb b/Golden_Repo/a/Autoconf/Autoconf-2.69-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fc039083f349135157b079a9209d785d5742da97
--- /dev/null
+++ b/Golden_Repo/a/Autoconf/Autoconf-2.69-GCCcore-11.2.0.eb
@@ -0,0 +1,41 @@
+easyblock = 'ConfigureMake'
+
+name = 'Autoconf'
+version = '2.69'
+
+homepage = 'https://www.gnu.org/software/autoconf/'
+
+description = """
+ Autoconf is an extensible package of M4 macros that produce shell scripts
+ to automatically configure software source code packages. These scripts can
+ adapt the packages to many kinds of UNIX-like systems without manual user
+ intervention. Autoconf creates a configuration script for a package from a
+ template file that lists the operating system features that the package can
+ use, in the form of M4 macro calls.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969']
+
+builddependencies = [
+    ('binutils', '2.37'),
+    # non-standard Perl modules are required,
+    # see https://github.com/easybuilders/easybuild-easyconfigs/issues/1822
+    ('Perl', '5.34.0'),
+]
+
+dependencies = [
+    ('M4', '1.4.19'),
+]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x
+              for x in ["autoconf", "autoheader", "autom4te", "autoreconf",
+                        "autoscan", "autoupdate", "ifnames"]],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
index 4b6ccca744514a21a962566ce26f948084d9d58d..390d9aab9cb0cd5c924af978093c2ddc9f83f938 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
@@ -15,6 +15,8 @@ source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 builddependencies = [
     # needed for autogen.sh on CentOS 7
     ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
 ]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
diff --git a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
index 683a9a89bcbf5826a793ce59672de13f650287d3..4a3abaf2ef836be6f77541945ab33cd44c813c31 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
@@ -16,6 +16,8 @@ source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 builddependencies = [
     # needed for autogen.sh on CentOS 7
     ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
 ]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
diff --git a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
index a145e5dd2e6f823f089eae6ec01c2ba2234061ea..bc860833771c384078b4f16eafb363d5f91a0dd4 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
@@ -15,6 +15,8 @@ source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 builddependencies = [
     # needed for autogen.sh on CentOS 7
     ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
 ]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
index 2b2660b3c403518799af4f27d6f421645d6aedbe..b95740c015158b8ab0135a1ce6b783e3584e8813 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
@@ -15,6 +15,8 @@ source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 builddependencies = [
     # needed for autogen.sh on CentOS 7
     ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
 ]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
index 0ac13af0943aa13dd1af5e19d22c249ffe120222..94e9fbce94246f3687a780da0f4502a32f3265ae 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
@@ -16,6 +16,8 @@ source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 builddependencies = [
     # needed for autogen.sh on CentOS 7
     ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
 ]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
index b7239e6a32df7891801e57de0c29ff65c976243f..b9f72e6bd7a2041fc8381b900e36a4e71920bae6 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
@@ -15,6 +15,8 @@ source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 builddependencies = [
     # needed for autogen.sh on CentOS 7
     ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
 ]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),