diff --git a/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-11.2.0.eb b/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-11.2.0.eb
index 1bc4c4a5a344f37a869006a3b79c53b3322bb71f..56d0c9048de71cfc517ccf83bf70a6a2499825bf 100644
--- a/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-11.2.0.eb
+++ b/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-11.2.0.eb
@@ -14,7 +14,7 @@ checksums = ['84413553994aef0070cf420050aa5c0a51b1956b404920e21b81e96db6a61a27']
 
 builddependencies = [
     ('binutils', '2.37'),
-    ('Autotools', '20210726', '', SYSTEM),
+    ('Autotools', '20210726'),
     ('xorg-macros', '1.19.3'),
 ]
 
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
index db2f8c5b5b8e120707f201cce05cb0a11497da5c..cf5bd68fa1b49d386f0d76f2c7eb9e783f63a403 100644
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
+++ b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
@@ -24,7 +24,7 @@ osdependencies = [
 ]
 
 builddependencies = [
-    ('Autotools', '20210726', '', SYSTEM),
+    ('Autotools', '20210726'),
     ('pkg-config', '0.29.2'),
 ]
 
diff --git a/Golden_Repo/x/X11/X11-20210802-GCCcore-11.2.0.eb b/Golden_Repo/x/X11/X11-20210802-GCCcore-11.2.0.eb
index b6e1cd8ef634c3c965f2ef8898c784491a472bb3..607744625b2eb1be373c6e266e1fa13acd58cd20 100644
--- a/Golden_Repo/x/X11/X11-20210802-GCCcore-11.2.0.eb
+++ b/Golden_Repo/x/X11/X11-20210802-GCCcore-11.2.0.eb
@@ -21,7 +21,7 @@ source_urls = [
 
 builddependencies = [
     ('binutils', '2.37'),
-    ('Autotools', '20210726', '', SYSTEM),
+    ('Autotools', '20210726'),
     ('Bison', '3.7.6'),
     ('gettext', '0.21'),
     ('pkg-config', '0.29.2'),
diff --git a/Golden_Repo/x/xorg-macros/xorg-macros-1.19.3-GCCcore-11.2.0.eb b/Golden_Repo/x/xorg-macros/xorg-macros-1.19.3-GCCcore-11.2.0.eb
index bce3cc7a221e95f10a0bba7ae188e6ed9ca2999f..5b6753c1efff0f09cdc2752b5ad1e216c6062bef 100644
--- a/Golden_Repo/x/xorg-macros/xorg-macros-1.19.3-GCCcore-11.2.0.eb
+++ b/Golden_Repo/x/xorg-macros/xorg-macros-1.19.3-GCCcore-11.2.0.eb
@@ -18,7 +18,7 @@ checksums = ['8205d210a580da0938f5ce4392a96b60cf1d9a5f792eaa1474fa4c1977aef4d0']
 
 builddependencies = [
     ('binutils', '2.37'),
-    ('Autotools', '20210726', '', SYSTEM),
+    ('Autotools', '20210726'),
 ]
 
 preconfigopts = './autogen.sh && '
diff --git a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
index 9e5be07c78f333aecc138878f6c976bd2b8ff01b..43848326d0cb64c3152985b947167d9c3b964974 100644
--- a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
+++ b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb
@@ -24,7 +24,7 @@ osdependencies = [
 ]
 
 builddependencies = [
-    ('Autotools', '20210726', '', SYSTEM),
+    ('Autotools', '20210726'),
     ('pkg-config', '0.29.2'),
 ]
 
diff --git a/Overlays/jurecadc_overlay/b/BullMPI/BullMPI-4.1.0-GCC-11.2.0.eb b/Overlays/jurecadc_overlay/b/BullMPI/BullMPI-4.1.0-GCC-11.2.0.eb
index dd8f3d40d61766f59ef5f8a0da5425cc16b64f8b..f3059aaff422f0dbcca38d9f784e3f50d78c8f2d 100644
--- a/Overlays/jurecadc_overlay/b/BullMPI/BullMPI-4.1.0-GCC-11.2.0.eb
+++ b/Overlays/jurecadc_overlay/b/BullMPI/BullMPI-4.1.0-GCC-11.2.0.eb
@@ -20,7 +20,7 @@ osdependencies = [
 ]
 
 builddependencies = [
-    ('Autotools', '20210726', '', SYSTEM),
+    ('Autotools', '20210726'),
     ('pkg-config', '0.29.2'),
 ]