diff --git a/Golden_Repo/m/mcxxcluster/mcxxcluster-1.0-gpsmpi-2022a-mt.eb b/Golden_Repo/m/mcxxcluster/mcxxcluster-1.0-gpsmpi-2022a-mt.eb
index 13bd3990cb3d0c154902bc5db99088e97ae024a1..b456b453e7dbe8c8d5eb8b36e6a2c0a2ef744f46 100644
--- a/Golden_Repo/m/mcxxcluster/mcxxcluster-1.0-gpsmpi-2022a-mt.eb
+++ b/Golden_Repo/m/mcxxcluster/mcxxcluster-1.0-gpsmpi-2022a-mt.eb
@@ -17,7 +17,7 @@ sources = [{
                 'tag': '1.0-ci'
     },
 }]
-checksums = ['2e6ae57a86a417f17c53848b47adb8e6c71cf2638b6d8372cc75ba9e52fd95af']
+checksums = ['95b3fc5771ab523cc18c9d9a311bfb252514b2e584812795f1ed952c19fd6efc']
 
 builddependencies = [
     ('Autotools', '20220317'),
@@ -28,13 +28,14 @@ builddependencies = [
 ]
 
 dependencies = [
-    ('nanoscluster', '1.0', '', ('gpsmpi', '2022a-mt')),
+    ('nanoscluster', '1.0'),
     ('SQLite', '3.38.3')
 ]
 
 preconfigopts = "autoreconf -vif && "
 
 configopts = "--enable-ompss-2 --with-nanos6=$NANOS6_HOME"
+#configopts = "--enable-ompss-2 --with-nanos6=/p/scratch/deepsea/piedrahta-velez1/easybuild/deep/software/nanoscluster/1.0-gpsmpi-2022a"
 
 buildopts = 'CC="$CC" CFLAGS="$CFLAGS"'
 
diff --git a/Golden_Repo/n/nanoscluster/nanoscluster-1.0-gpsmpi-2022a-mt.eb b/Golden_Repo/n/nanoscluster/nanoscluster-1.0-gpsmpi-2022a-mt.eb
index eb190b5a218d0a1a301e5a62bdb0c234954548d2..3d8fe84e7f07af99a0bbdff5e2f8551a0d26fcc4 100644
--- a/Golden_Repo/n/nanoscluster/nanoscluster-1.0-gpsmpi-2022a-mt.eb
+++ b/Golden_Repo/n/nanoscluster/nanoscluster-1.0-gpsmpi-2022a-mt.eb
@@ -1,3 +1,4 @@
+# EasyConfig for OmpSs-2/git
 easyblock = 'ConfigureMake'
 name = 'nanoscluster'
 version = '1.0'
@@ -14,10 +15,10 @@ sources = [{
         'url': 'https://github.com/ipiedrahiv',
         'repo_name': 'nanos6-cluster',
         'tag': '1.0-ci',
+        # 'clone_into': 'nanos6-cluster'
     }
 }]
-
-checksums = ['d816d14127234cefec01eaded8cc00ce6606e8513fab65543e6ced76b9111342']
+checksums = ['c770c47b3a67593a525615a60e6b454dac09a5104b1e4b3d2984d21ee94e3a55']
 
 dependencies = [('Boost', '1.79.0'),
                 ('hwloc', '2.7.1'),
@@ -28,8 +29,7 @@ builddependencies = [('Autotools', '20220317'),
 
 preconfigopts = "autoreconf -vif && "
 
-configopts = '--enable-cluster --disable-ctf-instrumentation --disable-graph-instrumentation'
-configopts += '--disable-lint-instrumentation --disable-verbose-instrumentation'
+configopts = "--enable-cluster --disable-ctf-instrumentation --disable-graph-instrumentation --disable-lint-instrumentation --disable-verbose-instrumentation"
 
 modextravars = {'NANOS6_HOME': '%(installdir)s'}
 
diff --git a/Golden_Repo/o/ompss2cluster/ompss2cluster-2023.11-gpsmpi-2022a.eb b/Golden_Repo/o/ompss2cluster/ompss2cluster-2023.11-gpsmpi-2022a.eb
index 564cc3ce3df4091fc306f7949f6454a7ff3db166..157d8969e5d523b60c28361f5c6452ca1867e3e2 100644
--- a/Golden_Repo/o/ompss2cluster/ompss2cluster-2023.11-gpsmpi-2022a.eb
+++ b/Golden_Repo/o/ompss2cluster/ompss2cluster-2023.11-gpsmpi-2022a.eb
@@ -1,3 +1,4 @@
+# EasyConfig for OmpSs-2
 easyblock = 'Bundle'
 name = 'ompss2cluster'
 version = '2023.11'
@@ -11,3 +12,6 @@ dependencies = [
     ('nanoscluster', '1.0'),
     ('mcxxcluster', '1.0')
 ]
+
+moduleclass = 'devel'
+