diff --git a/g/gpu_burn/gpu_burn-1.1-NVHPC-22.2-CUDA-11.6.0.eb b/g/gpu_burn/gpu_burn-1.1-NVHPC-22.2-CUDA-11.6.0.eb
new file mode 100644
index 00000000..c2418d66
--- /dev/null
+++ b/g/gpu_burn/gpu_burn-1.1-NVHPC-22.2-CUDA-11.6.0.eb
@@ -0,0 +1,43 @@
+# IT4Innovations 2022
+# JK
+
+easyblock = 'MakeCp'
+
+name = 'gpu_burn'
+version = '1.1'
+local_cudaversion = '11.6.0'
+local_commit = 'c535b67'
+versionsuffix = "-CUDA-%s" % local_cudaversion
+
+homepage = 'http://wili.cc/blog/gpu-burn.html'
+description = """Multi-GPU CUDA stress test"""
+
+toolchain = {'name': 'NVHPC', 'version': '22.2'}
+toolchainopts = {'opt': False}
+
+source_urls = ['https://github.com/wilicc/gpu-burn/archive']
+sources = [{'download_filename': '%s.tar.gz' % local_commit, 'filename': SOURCE_TAR_GZ}]
+checksums = [
+    '2dec738c935642395e15bd6ce71a14f8307c86661b3c8bc3826ff0272abf8f20',  # gpu_burn-1.1.tar.gz
+]
+
+dependencies = [('OpenMPI', '4.1.2', versionsuffix)]
+
+build_cmd = 'unset CFLAGS; make COMPUTE=8.0 CUDAPATH=${EBROOTCUDACORE}'
+
+files_to_copy = ['gpu_burn', 'gpu_burn-drv.o', 'compare.ptx', 'gpu_burn-drv.cpp', 'compare.cu']
+
+sanity_check_paths = {
+    'files': ['gpu_burn'],
+    'dirs': []
+}
+
+modluafooter = """
+add_property('arch', 'gpu')
+"""
+
+modextrapaths = {'PATH': '.'}
+
+parallel = 1 
+
+moduleclass = 'tools'
diff --git a/h/HyperQueue/HyperQueue-0.12.0.eb b/h/HyperQueue/HyperQueue-0.12.0.eb
new file mode 100644
index 00000000..0979ffc4
--- /dev/null
+++ b/h/HyperQueue/HyperQueue-0.12.0.eb
@@ -0,0 +1,27 @@
+# IT4Innovations 2022
+# JK
+
+easyblock = 'PackedBinary'
+
+name = 'HyperQueue'
+version = '0.12.0'
+
+homepage = 'https://it4innovations.github.io/hyperqueue/'
+description = """HyperQueue lets you build a computation plan consisting of a large amount of tasks
+ and then execute it transparently over a system like SLURM/PBS. It dynamically groups jobs into SLURM/PBS jobs
+ and distributes them to fully utilize allocated notes.
+ You thus do not have to manually aggregate your tasks into SLURM/PBS jobs."""
+
+toolchain = SYSTEM
+
+source_urls = ['https://github.com/It4innovations/hyperqueue/releases/download/v%(version)s/']
+sources = ['hq-v%(version)s-linux-x64.tar.gz']
+checksums = ['43de90b23dae2ba1534f98e9aaed439fcf32cf3c5728790445894b487b49f7ec']
+
+sanity_check_paths = {
+    'files': ['hq'],
+    'dirs': [],
+}
+
+
+moduleclass = 'devel'
diff --git a/n/nano/nano-6.4.eb b/n/nano/nano-6.4-GCCcore-11.3.0.eb
similarity index 78%
rename from n/nano/nano-6.4.eb
rename to n/nano/nano-6.4-GCCcore-11.3.0.eb
index baa31575..cbfc8cfb 100644
--- a/n/nano/nano-6.4.eb
+++ b/n/nano/nano-6.4-GCCcore-11.3.0.eb
@@ -10,15 +10,15 @@ homepage = 'https://www.nano-editor.org/'
 docurls = 'https://www.nano-editor.org/docs.php'
 description = """a simple editor, inspired by Pico"""
 
-toolchain = SYSTEM
+toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
 
 source_urls = ['https://www.nano-editor.org/dist/v6/']
 sources = [SOURCE_TAR_GZ]
 checksums = ['85ebd9b4dba49839821d529bea16ac1acae0c9b9db2157531e40c9dffeb1b656']
 
-dependencies = [('ncurses', '6.2')]
+builddependencies = [('binutils', '2.38')]
 
-configopts = '--enable-color --enable-extra --enable-multibuffer --enable-nanorc --enable-utf8'
+dependencies = [('ncurses', '6.3')]
 
 sanity_check_paths = {
     'files': ['bin/nano'],