diff --git a/Golden_Repo/j/JupyterProxy-NESTDesktop/JupyterProxy-NESTDesktop-0.3.4-GCCcore-11.3.0-2023.3.6.eb b/Golden_Repo/j/JupyterProxy-NESTDesktop/JupyterProxy-NESTDesktop-0.3.4-GCCcore-11.3.0-2023.3.6.eb
index fac26301e5440018be281bac776dd19d6ddbda96..c8130c0666a2775153d22eab7d3db9e8d663afc9 100644
--- a/Golden_Repo/j/JupyterProxy-NESTDesktop/JupyterProxy-NESTDesktop-0.3.4-GCCcore-11.3.0-2023.3.6.eb
+++ b/Golden_Repo/j/JupyterProxy-NESTDesktop/JupyterProxy-NESTDesktop-0.3.4-GCCcore-11.3.0-2023.3.6.eb
@@ -54,10 +54,6 @@ postinstallcmds = [
         '  module load GCC\\n'
         '  module load Python\\n'
         '  module load ParaStationMPI\\n'
-        '  module use /p/usersoftware/swmanage/goebbert1/stage2023/nest-desktop/easybuild/'
-        '\${SYSTEMNAME}/modules/all/Compiler/GCCcore/11.3.0/\\n'
-        '  module use /p/usersoftware/swmanage/goebbert1/stage2023/nest-desktop/easybuild/'
-        '\${SYSTEMNAME}/modules/all/MPI/GCC/11.3.0/psmpi/5/\\n'
         '  module load nest-simulator\\n'
         '  module load nest-desktop\\n"\n'
         'sed -i "s#<MODULES>#$prepenv#g" '
diff --git a/Golden_Repo/n/nest-desktop/nest-desktop-3.3.0-GCCcore-11.3.0-dev.eb b/Golden_Repo/n/nest-desktop/nest-desktop-3.3.0-GCCcore-11.3.0.eb
similarity index 78%
rename from Golden_Repo/n/nest-desktop/nest-desktop-3.3.0-GCCcore-11.3.0-dev.eb
rename to Golden_Repo/n/nest-desktop/nest-desktop-3.3.0-GCCcore-11.3.0.eb
index 62feec4ab70f6dc2249398c2c85b76c65ff3d042..1d9a11aa3e65fdfcd3ff3b656fdcf309b391ca7b 100644
--- a/Golden_Repo/n/nest-desktop/nest-desktop-3.3.0-GCCcore-11.3.0-dev.eb
+++ b/Golden_Repo/n/nest-desktop/nest-desktop-3.3.0-GCCcore-11.3.0.eb
@@ -2,7 +2,6 @@ easyblock = 'PythonBundle'
 
 name = 'nest-desktop'
 version = '3.3.0'
-versionsuffix = '-dev'
 
 homepage = 'https://nest-desktop.readthedocs.io'
 description = """
@@ -30,12 +29,11 @@ exts_default_options = {
     'use_pip_for_deps': False,
 }
 
-local_commit = '9837a2e12757303910a4314cae4513ed523d5721'
 exts_list = [
     ('nest-desktop', version, {
-        'source_urls': ['https://github.com/babsey/nest-desktop/archive/'],
-        'sources': ['%s.tar.gz' % local_commit],
-        'checksums': ['0554d7913194ee30d1bf997393c176dbdbb6e82600f26a78e2a1fd91f86fd9b0'],
+        'source_urls': ['https://github.com/nest-desktop/nest-desktop/archive/'],
+        'sources': ['v%s.tar.gz' % version],
+        'checksums': ['e82e7aeafe15e822e100b490ec3254ee6d2ec60f8539f44c4e37abc914c21989'],
         'buildcmd': 'yarn install && yarn build',
     }),
 ]
diff --git a/Golden_Repo/n/nest-simulator/nest-simulator-3.6-gpsmkl-2022a-dev.eb b/Golden_Repo/n/nest-simulator/nest-simulator-3.6-gpsmkl-2022a.eb
similarity index 89%
rename from Golden_Repo/n/nest-simulator/nest-simulator-3.6-gpsmkl-2022a-dev.eb
rename to Golden_Repo/n/nest-simulator/nest-simulator-3.6-gpsmkl-2022a.eb
index 2368d16ebff376a227ffcf730ceade8b463b6a8d..d281c1283ac228d7951f599f29b62e3bf8378f0a 100644
--- a/Golden_Repo/n/nest-simulator/nest-simulator-3.6-gpsmkl-2022a-dev.eb
+++ b/Golden_Repo/n/nest-simulator/nest-simulator-3.6-gpsmkl-2022a.eb
@@ -2,7 +2,6 @@ easyblock = 'PythonBundle'
 
 name = 'nest-simulator'
 version = '3.6'
-versionsuffix = '-dev'
 
 homepage = 'https://www.nest-simulator.org/'
 description = """NEST is a simulator for spiking neural network models
@@ -30,15 +29,14 @@ dependencies = [
     ('libneurosim', '1.2.0'),
 ]
 
-local_commit = 'b28bdee477128ce7f2125f1fd9860b36cafc2bdd'
 components = [
     ('nest-simulator', '%s' % version, {
         'easyblock': 'CMakeMake',
-        'source_urls': ['https://github.com/babsey/nest-simulator/archive/'],
-        'sources': ['%s.tar.gz' % local_commit],
-        'checksums': ['94da867f41b950a2af33f3ce9df663ccd241c64ced6bdc95ecc5c8dc074a9e2b'],
+        'source_urls': ['https://github.com/nest/nest-simulator/archive/'],
+        'sources': ['v%s.tar.gz' % version],
+        'checksums': ['68d6b11791e1284dc94fef35d84c08dd7a11322c0f1e1fc9b39c5e6882284922'],
         'separate_build_dir': True,
-        'start_dir': 'nest-simulator-%s' % local_commit,
+        'start_dir': 'nest-simulator-%s' % version,
         'configopts': (
             '-DCMAKE_VERBOSE_MAKEFILE=ON '
             '-Dwith-libraries=OFF '