diff --git a/Golden_Repo/h/hwloc/hwloc-2.7.1-GCCcore-11.3.0.eb b/Golden_Repo/h/hwloc/hwloc-2.7.1-GCCcore-11.3.0.eb
index b0427412f810a96ebe7e4bad1383ecab827d5bf7..bd30b42db4be7238f80ab6ad03830fa4ecde2f30 100644
--- a/Golden_Repo/h/hwloc/hwloc-2.7.1-GCCcore-11.3.0.eb
+++ b/Golden_Repo/h/hwloc/hwloc-2.7.1-GCCcore-11.3.0.eb
@@ -27,7 +27,7 @@ builddependencies = [
 ]
 
 dependencies = [
-    ('numactl', '2.0.15', '', SYSTEM),
+    ('numactl', '2.0.15'),
     ('libxml2', '2.9.13'),
     ('libpciaccess', '0.16'),
 ]
diff --git a/Golden_Repo/n/NCCL/NCCL-default-GCCcore-11.3.0-CUDA-11.7.eb b/Golden_Repo/n/NCCL/NCCL-default-GCCcore-11.3.0-CUDA-11.7.eb
index 00fc8cb669d576810019870e143242d26fc4d697..c4d73794090ff59d7b3291ef7d8cdf14220b9458 100644
--- a/Golden_Repo/n/NCCL/NCCL-default-GCCcore-11.3.0-CUDA-11.7.eb
+++ b/Golden_Repo/n/NCCL/NCCL-default-GCCcore-11.3.0-CUDA-11.7.eb
@@ -24,8 +24,8 @@ checksums = ['8108e00bcf995666330484cf24a5cc52c3a392acaa5aeabf88e2e168e07c291d']
 builddependencies = [('binutils', '2.38')]
 
 dependencies = [
-    ('CUDA', '11.7', '', True),
-    ('UCX', 'default', '', SYSTEM),
+    ('CUDA', '11.7'),
+    ('UCX', 'default'),
 ]
 
 moduleclass = 'lib'
diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
index 0a60cc3de4aae19f42faadf1cda6b23d194c9508..cd874fab11bae22271d61966fe7dba04106e77b0 100644
--- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
+++ b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
@@ -34,8 +34,8 @@ builddependencies = [
 dependencies = [
     ('zlib', '1.2.12'),
     ('hwloc', '2.7.1'),
-    ('UCX', 'default', '', SYSTEM),
-    ('CUDA', '11.7', '', SYSTEM),
+    ('UCX', 'default'),
+    ('CUDA', '11.7'),
     ('libevent', '2.1.12'),
     ('PMIx', '3.2.3'),  # We rely on this version since it is the newest supported by psmgmt
     ('UCC', 'default'),
diff --git a/Golden_Repo/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb b/Golden_Repo/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
index 4ce432c499589d1de6c40e8ea97885199264a596..a76f7c52ef39a0e0d9284c43d067981b38cbfc5b 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
@@ -20,11 +20,11 @@ checksums = [
 ]
 
 dependencies = [
-    ('pscom', '5.6-default', '', SYSTEM),
+    ('pscom', '5.6-default'),
     # needed due to the inclusion of hwloc
     ('libxml2', '2.9.13'),
     # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.7.0', '', SYSTEM)
+    ('CUDA', '11.7')
 ]
 
 patches = [
diff --git a/Golden_Repo/u/UCC/UCC-default-GCCcore-11.3.0.eb b/Golden_Repo/u/UCC/UCC-default-GCCcore-11.3.0.eb
index 66990644ffefa65c01fe0fc700c2ba0025ed74d8..a7520f1a57e25c34743d32f9154c626ee0ed5ad7 100644
--- a/Golden_Repo/u/UCC/UCC-default-GCCcore-11.3.0.eb
+++ b/Golden_Repo/u/UCC/UCC-default-GCCcore-11.3.0.eb
@@ -30,8 +30,8 @@ builddependencies = [
 ]
 
 dependencies = [
-    ('UCX', 'default', '', SYSTEM),
-    ('CUDA', '11.7', '', SYSTEM),
+    ('UCX', 'default'),
+    ('CUDA', '11.7'),
     ('NCCL', 'default', '-CUDA-%(cudashortver)s'),
 ]
 
diff --git a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
index f02498ff16a2ccc67736133ebad819f2a4bf4960..02760fa46e70b885ba184b3ef14ae01326fba1f1 100644
--- a/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
+++ b/Overlays/hdfml_overlay/o/OpenMPI/OpenMPI-4.1.4-GCC-11.3.0.eb
@@ -34,8 +34,8 @@ builddependencies = [
 dependencies = [
     ('zlib', '1.2.12'),
     ('hwloc', '2.7.1'),
-    ('UCX', 'default', '', SYSTEM),
-    ('CUDA', '11.7', '', SYSTEM),
+    ('UCX', 'default'),
+    ('CUDA', '11.7'),
     ('libevent', '2.1.12'),
     ('PMIx', '3.2.3'),  # We rely on this version since it is the newest supported by psmgmt
     ('UCC', 'default'),
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
index 8802bddf14805efd46c070ca7275acf4f1d98247..d8f50653d9e67b01bb3189e4e312881f2bf30a19 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.6.0-1-GCC-11.3.0.eb
@@ -18,11 +18,11 @@ checksums = [
 ]
 
 dependencies = [
-    ('pscom', '5.6-default', '', SYSTEM),
+    ('pscom', '5.6-default'),
     # needed due to the inclusion of hwloc
     ('libxml2', '2.9.13'),
     # Including CUDA here to trigger the hook to add the gpu property, and because it is actually needed
-    ('CUDA', '11.7.0', '', SYSTEM)
+    ('CUDA', '11.7')
 ]
 
 patches = [