diff --git a/packages/genpybind/package.py b/packages/genpybind/package.py
index f53981393eb9e3b800a2dd38585c50e797408abb..012d2e5b6821740b5b4ad197afb84a598411823b 100644
--- a/packages/genpybind/package.py
+++ b/packages/genpybind/package.py
@@ -21,6 +21,7 @@ class Genpybind(WafPackage):
     version('develop', branch='develop')
 
     version('visions', branch='master', git='https://github.com/electronicvisions/genpybind')
+    version('ebrains-llvm15', tag='ebrains-9.0-a9', git='https://github.com/electronicvisions/genpybind')
     version('ebrains', tag='ebrains_release-1-rc1', git='https://github.com/electronicvisions/genpybind')
 
     depends_on(
diff --git a/packages/hxtorch/package.py b/packages/hxtorch/package.py
index ef237cebb64422dee0bd0989ef871c0b0a1dd5e1..d4a5ea66992015f94a3bfdad4077394df019c082 100644
--- a/packages/hxtorch/package.py
+++ b/packages/hxtorch/package.py
@@ -53,7 +53,7 @@ class Hxtorch(build_brainscales.BuildBrainscales):
         ('boost@1.69.0: +graph+icu+mpi+numpy+coroutine+context+filesystem+python+serialization+system+thread+program_options cxxstd=17', { "type": ('build', 'link', 'run', 'test') } ),
         ('cereal', { "type": ('build', 'link', 'run', 'test') } ),
         ('cppcheck', { "type": ('build', 'link', 'run') } ),
-        ('genpybind@ebrains', { "type": ('build', 'link') } ),
+        ('genpybind@ebrains-llvm15', { "type": ('build', 'link') } ),
         ('gflags', { "type": ('build', 'link', 'run') } ),
         ('googletest@1.11.0:+gmock', { "type": ('build', 'link', 'run') } ), # variadic templates needed
         ('inja', { "type": ('build', 'link', 'run', 'test')  } ),# template engine for PPU source jit generation
diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py
index 3e68558dfe5f3a9b9974b69737b3727906b28152..e0836671c8eda681192af053e2685a220d7a1e43 100644
--- a/packages/pynn-brainscales/package.py
+++ b/packages/pynn-brainscales/package.py
@@ -51,7 +51,7 @@ class PynnBrainscales(build_brainscales.BuildBrainscales):
     depends_on('boost@1.69.0: +graph+icu+mpi+numpy+coroutine+context+filesystem+python+serialization+system+thread+program_options cxxstd=17', type=('build', 'link', 'run', 'test'))
     depends_on('cereal', type=('build', 'link', 'run', 'test'))
     depends_on('cppcheck', type=('build', 'link', 'run'))
-    depends_on('genpybind@ebrains', type=('build', 'link'))
+    depends_on('genpybind@ebrains-llvm15', type=('build', 'link'))
     depends_on('gflags', type=('build', 'link', 'run'))
     depends_on('googletest@1.11.0:+gmock', type=('build', 'link', 'run')) # variadic templates needed
     depends_on('inja', type=('build', 'link', 'run', 'test')) # template engine for PPU source jit generation