diff --git a/.github/workflows/test_compare_stacks.yml b/.github/workflows/test_compare_stacks.yml
index c47f174705..3e2b6a715c 100644
--- a/.github/workflows/test_compare_stacks.yml
+++ b/.github/workflows/test_compare_stacks.yml
@@ -24,6 +24,7 @@ jobs:
         COMPARISON_ARCH:
         - aarch64/neoverse_n1
         - aarch64/neoverse_v1
+        - aarch64/nvidia/grace
         - x86_64/amd/zen2
         - x86_64/amd/zen3
         - x86_64/amd/zen4
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20250425-eb-4.9.4-hatchling-1.18.0-updated-easyconfig-grace.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20250425-eb-4.9.4-hatchling-1.18.0-updated-easyconfig-grace.yml
new file mode 100644
index 0000000000..25a8d002b5
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20250425-eb-4.9.4-hatchling-1.18.0-updated-easyconfig-grace.yml
@@ -0,0 +1,10 @@
+# 2025.04.25
+# hatchling-1.18.0 rebuild to account for easyconfig changed upstream 
+# see https://gitlab.com/eessi/support/-/issues/85 and
+# https://github.com/easybuilders/easybuild-easyconfigs/pull/20389
+# (noticed when rebuilding things for Grace)
+easyconfigs:
+  - hatchling-1.18.0-GCCcore-13.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20389
+        from-commit: 9580c0d67d6dd97b160b768a839bfcba6d5b21b9