diff --git a/create_lmodsitepackage.py b/create_lmodsitepackage.py
index 7e55bce2a5..62f073c9a6 100755
--- a/create_lmodsitepackage.py
+++ b/create_lmodsitepackage.py
@@ -28,7 +28,7 @@
     -- If EESSI_PREFIX wasn't defined, we cannot check if this module was from the EESSI environment
     -- In that case, we assume it isn't, otherwise EESSI_PREFIX would (probably) have been set
     if eessi_prefix == nil then
-        return False
+        return false
     else
         -- NOTE: exact paths for site so may need to be updated later.
         -- See https://github.com/EESSI/software-layer/pull/371
diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.2-2023a.yml
index 2f884f1838..6474d658ce 100644
--- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -19,3 +19,8 @@ easyconfigs:
         # https://github.com/easybuilders/easybuild-easyconfigs/pull/20841
         from-commit: f0e91e6e430ebf902f7788ebb47f0203dee60649
   - R-4.3.2-gfbf-2023a.eb
+  - Highway-1.0.4-GCCcore-12.3.0.eb
+  - Brunsli-0.1-GCCcore-12.3.0.eb:
+      options:
+        # https://github.com/easybuilders/easybuild-easyconfigs/pull/21366
+        from-commit: 1736a123b1685836452587a5c51793257570bb2d
diff --git a/eb_hooks.py b/eb_hooks.py
index 6cac9b8609..3e095129f9 100644
--- a/eb_hooks.py
+++ b/eb_hooks.py
@@ -333,7 +333,7 @@ def pre_prepare_hook_highway_handle_test_compilation_issues(self, *args, **kwarg
     Solve issues with compiling or running the tests on both
     neoverse_n1 and neoverse_v1 with Highway 1.0.4 and GCC 12.3.0:
       - for neoverse_n1 we set optarch to GENERIC
-      - for neoverse_v1 we completely disable the tests
+      - for neoverse_v1 and a64fx we completely disable the tests
     cfr. https://github.com/EESSI/software-layer/issues/469
     """
     if self.name == 'Highway':
@@ -342,7 +342,7 @@ def pre_prepare_hook_highway_handle_test_compilation_issues(self, *args, **kwarg
         # note: keep condition in sync with the one used in 
         # post_prepare_hook_highway_handle_test_compilation_issues
         if self.version in ['1.0.4'] and tcname == 'GCCcore' and tcversion == '12.3.0':
-            if cpu_target == CPU_TARGET_NEOVERSE_V1:
+            if cpu_target in [CPU_TARGET_A64FX, CPU_TARGET_NEOVERSE_V1]:
                 self.cfg.update('configopts', '-DHWY_ENABLE_TESTS=OFF')
             if cpu_target == CPU_TARGET_NEOVERSE_N1:
                 self.orig_optarch = build_option('optarch')