diff --git a/.github/workflows/buildJDK.yml b/.github/workflows/buildJDK.yml
index d7f6335..b0f0acb 100644
--- a/.github/workflows/buildJDK.yml
+++ b/.github/workflows/buildJDK.yml
@@ -64,7 +64,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        mandrel-ref: [graal/master]
+        mandrel-ref: [mandrel/25.0]
     steps:
     - uses: actions/checkout@v3
     - uses: actions/checkout@v3
@@ -172,8 +172,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, macos-13]
-        mandrel-ref: [graal/master]
+        os: [macos-latest]
+        mandrel-ref: [mandrel/25.0]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/checkout@v4
@@ -298,7 +298,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        mandrel-ref: [graal/master]
+        mandrel-ref: [mandrel/25.0]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/checkout@v4
@@ -428,7 +428,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        mandrel-ref: [graal/master]
+        mandrel-ref: [mandrel/25.0]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/checkout@v4
diff --git a/build.java b/build.java
index 877a937..7b6717f 100644
--- a/build.java
+++ b/build.java
@@ -1027,6 +1027,7 @@ class Mx
                 "sdk:POLYGLOT," +
                 "sdk:WORD," +
                 "SVM," +
+                "SVM_CAPNPROTO_RUNTIME," +
                 "NATIVE_IMAGE_BASE," +
                 "POINTSTO," +
                 "LIBRARY_SUPPORT," +
@@ -1039,6 +1040,7 @@ class Mx
                 "SVM_DIAGNOSTICS_AGENT," +
                 "SVM_CONFIGURE," +
                 "SVM_FOREIGN," +
+                "espresso-shared:ESPRESSO_SVM," +
                 "MANDREL_PACKAGING_WRAPPER")
     );