diff --git a/Custom_EasyBlocks/score_p.py b/Custom_EasyBlocks/score_p.py
index 4c6f49c2054b909d9175a337696d7d6ae7fada4e..bf781fc6ee305af175ed6f5b22b139ada175787c 100644
--- a/Custom_EasyBlocks/score_p.py
+++ b/Custom_EasyBlocks/score_p.py
@@ -76,8 +76,11 @@ class EB_Score_minus_P(ConfigureMake):
                 'CubeLib': '4.8',
                 'CubeGUI': '4.8',
             }
-            if LooseVersion(self.version) < LooseVersion(nvhpc_since.get(self.name, '0')):
-                comp_opts[toolchain.NVHPC] = 'pgi'
+            try:
+                if LooseVersion(self.version) < LooseVersion(nvhpc_since.get(self.name, '0')):
+                    comp_opts[toolchain.NVHPC] = 'pgi'
+            except:
+                print ("Comparison with 'LooseVersion' failed for ",self.version,"and",nvhpc_since.get(self.name, '0') )
 
             comp_fam = self.toolchain.comp_family()
             if comp_fam in comp_opts:
diff --git a/Golden_Repo/s/Scalasca/Scalasca-2023-09-26-gpsmpi-2022a-pmix.eb b/Golden_Repo/s/Scalasca/Scalasca-deepsea-v1-gpsmpi-2022a-pmix.eb
similarity index 89%
rename from Golden_Repo/s/Scalasca/Scalasca-2023-09-26-gpsmpi-2022a-pmix.eb
rename to Golden_Repo/s/Scalasca/Scalasca-deepsea-v1-gpsmpi-2022a-pmix.eb
index 5f6afc602aac573734e5731809c5f972d22e8046..6f27ab603c9fa1d37d28c2ca30be7e7bb71323eb 100644
--- a/Golden_Repo/s/Scalasca/Scalasca-2023-09-26-gpsmpi-2022a-pmix.eb
+++ b/Golden_Repo/s/Scalasca/Scalasca-deepsea-v1-gpsmpi-2022a-pmix.eb
@@ -13,7 +13,7 @@
 easyblock = 'EB_Score_minus_P'
 
 name = 'Scalasca'
-version = '2023-09-26'
+version = 'deepsea-v1'
 
 homepage = 'https://www.scalasca.org/'
 description = """
@@ -26,10 +26,10 @@ in exploring their causes.
 
 toolchain = {'name': 'gpsmpi', 'version': '2022a-pmix'}
 
-source_urls = ['https://perftools.pages.jsc.fz-juelich.de/cicd/scalasca/branches/MR71/']
-sources = ['sources.ed3f096d.tar.gz']
+source_urls = ['https://apps.fz-juelich.de/scalasca/project/deep-sea']
+sources = ['scalasca-deepsea-v1.tar.gz']
 checksums = [
-    '2c7ff194ee5c59b2213f0a7fe6e5f005eb15f4e16e9abad63a6cc648d8c3394c',  # sources.ed3f096d.tar.gz
+    '2c7ff194ee5c59b2213f0a7fe6e5f005eb15f4e16e9abad63a6cc648d8c3394c',  # scalasca-deepsea-v1.tar.gz
 ]
 builddependencies = [
     ('CubeWriter', '4.8.2'),
@@ -39,7 +39,7 @@ dependencies = [
     ('CubeGUI', '4.8.2'),
     ('CubeLib', '4.8.2'),
     ('OTF2', '3.0.3'),
-    ('Score-P', '2023-09-26'),
+    ('Score-P', 'deepsea-v1'),
 ]
 
 sanity_check_paths = {
diff --git a/Golden_Repo/s/Score-P/Score-P-2023-09-26-gpsmpi-2022a-pmix.eb b/Golden_Repo/s/Score-P/Score-P-deepsea-v1-gpsmpi-2022a-pmix.eb
similarity index 91%
rename from Golden_Repo/s/Score-P/Score-P-2023-09-26-gpsmpi-2022a-pmix.eb
rename to Golden_Repo/s/Score-P/Score-P-deepsea-v1-gpsmpi-2022a-pmix.eb
index b95568191067ed62d86df636bc70aa477faf73c9..75bbf83e66a902cad025e684e659d041e91fd533 100644
--- a/Golden_Repo/s/Score-P/Score-P-2023-09-26-gpsmpi-2022a-pmix.eb
+++ b/Golden_Repo/s/Score-P/Score-P-deepsea-v1-gpsmpi-2022a-pmix.eb
@@ -13,7 +13,7 @@
 easyblock = 'EB_Score_minus_P'
 
 name = 'Score-P'
-version = '2023-09-26'
+version = 'deepsea-v1'
 
 homepage = 'https://www.score-p.org'
 description = """
@@ -24,10 +24,10 @@ applications.
 
 toolchain = {'name': 'gpsmpi', 'version': '2022a-pmix'}
 
-source_urls = ['https://perftools.pages.jsc.fz-juelich.de/cicd/scorep/branches/MR195']
-sources = ['sources.15529a7c.tar.gz']
+source_urls = ['https://apps.fz-juelich.de/scalasca/project/deep-sea']
+sources = ['scorep-deepsea-v1.tar.gz']
 checksums = [
-    'ca8cc49909965aaa59173821627c61945f3b4bdae0d7b582d374522a5322fbe1',  # sources.15529a7c.tar.gz
+    'ca8cc49909965aaa59173821627c61945f3b4bdae0d7b582d374522a5322fbe1',  # scorep-deepsea-v1.tar.gz
 ]
 
 builddependencies = [
diff --git a/Golden_Repo/t/taz/taz-0.33-gsmpi-2022a.eb b/Golden_Repo/t/taz/taz-0.33-gsmpi-2022a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eff089357ebd121f4e2248cacce16e80c95407f4
--- /dev/null
+++ b/Golden_Repo/t/taz/taz-0.33-gsmpi-2022a.eb
@@ -0,0 +1,51 @@
+
+# To build manually:
+# ml purge
+# export USERINSTALLATIONS=/p/project/deepsea/preliminary_SW
+# ml UserInstallations
+# 
+# eb taz.eb
+
+easyblock = 'CMakeMake'
+
+name = 'Taz'
+version = '0.33'
+
+homepage = 'https://github.com/CARV-ICS-FORTH/taz'
+description = "Taz is a very fast simulator that replays traces of MPI applications in the presence of failures" 
+
+# toolchain = {'name':'GCCcore', 'version':'11.3.0'} 
+toolchain = {'name': 'gpsmpi', 'version': '2022a'}
+
+local_taz_archive_filename = f"taz_archive_{version}.tar.gz"
+sources = [{
+    'filename': local_taz_archive_filename,
+    'git_config': {
+        'url': 'git@gitlab.jsc.fz-juelich.de:deep-sea/wp5/software',
+        'repo_name': 'taz',
+        'tag': 'v' + version,
+        'recursive': False,  # Use flatbuffers and libscotch from the system
+        'keep_git_dir': True,
+    },
+}]
+checksums = ['3cd0eb3674e4638b3e92526507543cd77b7323d374189d98ee839c289fa82e81']
+
+# sources = [local_taz_archive_filename]
+
+builddependencies = [
+    ('Boost', '1.79.0'),
+    ('CMake', '3.23.1'),
+    ('SCOTCH', '7.0.1'),
+    ('flatbuffers', '2.0.7')
+]
+
+configopts = '-DADD_HEAVY_TESTS=0 -DCMAKE_BUILD_TYPE=Release -DGENERATE_FBS=1 -DGENERATE_VENV=0 -DENABLE_LTO=0'
+
+# runtest = True
+
+sanity_check_paths = {
+    'dirs': ['bin'],
+    'files': ['bin/taz-simulate', 'bin/taz-show-matrix', 'bin/taz-show-csv']
+}
+
+moduleclass = 'tools'