diff --git a/.github/workflows/mandrel.yml b/.github/workflows/mandrel.yml
index d21d1e3d16a3..98cb5027f266 100644
--- a/.github/workflows/mandrel.yml
+++ b/.github/workflows/mandrel.yml
@@ -31,6 +31,7 @@ jobs:
     name: "Q main M 23.0 EA"
     uses: graalvm/mandrel/.github/workflows/base.yml@default
     with:
+      build-type: "mandrel-source-nolocalmvn"
       quarkus-version: "main"
       repo: ${{ github.repository }}
       version: ${{ github.ref }}
@@ -40,6 +41,7 @@ jobs:
     name: "Q main M 23.0 windows EA"
     uses: graalvm/mandrel/.github/workflows/base-windows.yml@default
     with:
+      build-type: "mandrel-source-nolocalmvn"
       quarkus-version: "main"
       repo: ${{ github.repository }}
       version: ${{ github.ref }}
@@ -49,6 +51,7 @@ jobs:
     name: "Q main M 23.0 EA Java 20"
     uses: graalvm/mandrel/.github/workflows/base.yml@default
     with:
+      build-type: "mandrel-source-nolocalmvn"
       quarkus-version: "main"
       repo: ${{ github.repository }}
       version: ${{ github.ref }}
@@ -58,6 +61,7 @@ jobs:
     name: "Q main M 23.0 windows EA Java 20"
     uses: graalvm/mandrel/.github/workflows/base-windows.yml@default
     with:
+      build-type: "mandrel-source-nolocalmvn"
       quarkus-version: "main"
       repo: ${{ github.repository }}
       version: ${{ github.ref }}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrManager.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrManager.java
index 86249befb3f7..9abe5dfbe7a0 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrManager.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrManager.java
@@ -86,8 +86,8 @@ public static JfrManager get() {
     public RuntimeSupport.Hook startupHook() {
         return isFirstIsolate -> {
             parseFlightRecorderLogging(SubstrateOptions.FlightRecorderLogging.getValue());
+            periodicEventSetup();
             if (isJFREnabled()) {
-                periodicEventSetup();
                 initRecording();
             }
         };