diff --git a/Golden_Repo/jusuf_overlay/v/Vampir/Vampir-9.9.0.eb b/Golden_Repo/jusuf_overlay/v/Vampir/Vampir-9.9.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b52587b858076bfcc4f4fbea45bbc7431a8233f7
--- /dev/null
+++ b/Golden_Repo/jusuf_overlay/v/Vampir/Vampir-9.9.0.eb
@@ -0,0 +1,40 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+easyblock = 'Binary'
+
+name = "Vampir"
+version = "9.9.0"
+local_archsuffix = "-linux-x86_64"
+
+homepage = 'http://www.vampir.eu'
+description = """The VAMPIR software tool provides an easy-to-use framework that enables
+developers to quickly display and analyze arbitrary program behavior at any level of detail.
+The tool suite implements optimized event analysis algorithms and customizable displays that
+enable fast and interactive rendering of very complex performance monitoring data.
+
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+sources = ['vampir-%s%s-setup.sh' % (version, local_archsuffix)]
+
+install_cmd = './vampir-%(version)s-linux-x86_64-setup.sh --silent --instdir=%(installdir)s'
+
+sanity_check_paths = {
+    'files': ["bin/vampir", "doc/vampir-manual.pdf"],
+    'dirs': []
+}
+
+modextravars = {
+    'VAMPIR_LICENSE': '/p/software/jusuf/licenses/vampir/vampir.license',
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/jusuf_overlay/v/VampirServer/VampirServer-9.9.0-gpsmpi-2020.eb b/Golden_Repo/jusuf_overlay/v/VampirServer/VampirServer-9.9.0-gpsmpi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..edcba855dada07783b1bda33dd4a212b9b00719f
--- /dev/null
+++ b/Golden_Repo/jusuf_overlay/v/VampirServer/VampirServer-9.9.0-gpsmpi-2020.eb
@@ -0,0 +1,61 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+easyblock = 'Binary'
+
+name = "VampirServer"
+version = "9.9.0"
+
+homepage = 'http://www.vampir.eu'
+description = """The VAMPIR software tool provides an easy-to-use framework that enables
+developers to quickly display and analyze arbitrary program behavior at any level of detail.
+The tool suite implements optimized event analysis algorithms and customizable displays that
+enable fast and interactive rendering of very complex performance monitoring data.
+"""
+
+usage = """
+To start VampirServer
+module load Vampir VampirServer
+vampir &
+BATCH_OPT="--account=<budget> --partition=<partition>" vampirserver start -n 4 mpi
+(note server + port + server_id)
+- Use it
+Vampir GUI-> open other -> remote file -> server + port
+- To stop VampirServer
+vampirserver stop <server_id>
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'gpsmpi', 'version': '2020'}
+
+toolchainopts = {"usempi": True}
+
+sources = ['vampirserver-%s-linux-x86_64-setup.sh' % (version)]
+
+install_cmd = ('./vampirserver-%(version)s-linux-x86_64-setup.sh --silent --instdir=%(installdir)s '
+               '&& %(installdir)s/bin/vampirserver config --silent')
+
+sanity_check_paths = {
+    'files': ["bin/vampirserver", "doc/vampirserver-manual.pdf"],
+    'dirs': []
+}
+
+# Remove Cray-specific 'ap' launcher,
+# use SLURM launcher as MPI launcher and default
+postinstallcmds = [
+    'rm %(installdir)s/etc/server/launcher/ap',
+    '''sed -i s/'BATCH_OPT=""'/'#BATCH_OPT=""'/g %(installdir)s/etc/server/launcher/custom/slurm''',
+    'cp %(installdir)s/etc/server/launcher/custom/slurm %(installdir)s/etc/server/launcher/mpi',
+]
+
+modextravars = {
+    'VAMPIR_LICENSE': '/p/software/jusuf/licenses/vampir/vampir.license',
+}
+
+moduleclass = 'perf'
diff --git a/Golden_Repo/juwels_overlay/v/Vampir/Vampir-9.9.0.eb b/Golden_Repo/juwels_overlay/v/Vampir/Vampir-9.9.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..413d5167f8c0eca10b39fc08171dfa6eaaac8811
--- /dev/null
+++ b/Golden_Repo/juwels_overlay/v/Vampir/Vampir-9.9.0.eb
@@ -0,0 +1,40 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+easyblock = 'Binary'
+
+name = "Vampir"
+version = "9.9.0"
+local_archsuffix = "-linux-x86_64"
+
+homepage = 'http://www.vampir.eu'
+description = """The VAMPIR software tool provides an easy-to-use framework that enables
+developers to quickly display and analyze arbitrary program behavior at any level of detail.
+The tool suite implements optimized event analysis algorithms and customizable displays that
+enable fast and interactive rendering of very complex performance monitoring data.
+
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = SYSTEM
+
+sources = ['vampir-%s%s-setup.sh' % (version, local_archsuffix)]
+
+install_cmd = './vampir-%(version)s-linux-x86_64-setup.sh --silent --instdir=%(installdir)s'
+
+sanity_check_paths = {
+    'files': ["bin/vampir", "doc/vampir-manual.pdf"],
+    'dirs': []
+}
+
+modextravars = {
+    'VAMPIR_LICENSE': '/p/software/juwels/licenses/vampir/vampir.license',
+}
+
+moduleclass = 'tools'
diff --git a/Golden_Repo/juwels_overlay/v/VampirServer/VampirServer-9.9.0-gpsmpi-2020.eb b/Golden_Repo/juwels_overlay/v/VampirServer/VampirServer-9.9.0-gpsmpi-2020.eb
new file mode 100644
index 0000000000000000000000000000000000000000..44937799673e5ac07ab11ea32c4f90678a69e7ef
--- /dev/null
+++ b/Golden_Repo/juwels_overlay/v/VampirServer/VampirServer-9.9.0-gpsmpi-2020.eb
@@ -0,0 +1,61 @@
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+# Copyright:: Copyright 2013 Juelich Supercomputing Centre, Germany
+# Authors::   Bernd Mohr <b.mohr@fz-juelich.de>
+# License::   New BSD
+#
+# This work is based from experiences from the UNITE project
+# http://apps.fz-juelich.de/unite/
+##
+easyblock = 'Binary'
+
+name = "VampirServer"
+version = "9.9.0"
+
+homepage = 'http://www.vampir.eu'
+description = """The VAMPIR software tool provides an easy-to-use framework that enables
+developers to quickly display and analyze arbitrary program behavior at any level of detail.
+The tool suite implements optimized event analysis algorithms and customizable displays that
+enable fast and interactive rendering of very complex performance monitoring data.
+"""
+
+usage = """
+To start VampirServer
+module load Vampir VampirServer
+vampir &
+BATCH_OPT="--account=<budget> --partition=<partition>" vampirserver start -n 4 mpi
+(note server + port + server_id)
+- Use it
+Vampir GUI-> open other -> remote file -> server + port
+- To stop VampirServer
+vampirserver stop <server_id>
+"""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'gpsmpi', 'version': '2020'}
+
+toolchainopts = {"usempi": True}
+
+sources = ['vampirserver-%s-linux-x86_64-setup.sh' % (version)]
+
+install_cmd = ('./vampirserver-%(version)s-linux-x86_64-setup.sh --silent --instdir=%(installdir)s '
+               '&& %(installdir)s/bin/vampirserver config --silent')
+
+sanity_check_paths = {
+    'files': ["bin/vampirserver", "doc/vampirserver-manual.pdf"],
+    'dirs': []
+}
+
+# Remove Cray-specific 'ap' launcher,
+# use SLURM launcher as MPI launcher and default
+postinstallcmds = [
+    'rm %(installdir)s/etc/server/launcher/ap',
+    '''sed -i s/'BATCH_OPT=""'/'#BATCH_OPT=""'/g %(installdir)s/etc/server/launcher/custom/slurm''',
+    'cp %(installdir)s/etc/server/launcher/custom/slurm %(installdir)s/etc/server/launcher/mpi',
+]
+
+modextravars = {
+    'VAMPIR_LICENSE': '/p/software/juwels/licenses/vampir/vampir.license',
+}
+
+moduleclass = 'perf'