diff --git a/dsp/examples/riscv_tests/fft_demo/beaglev_fire/fft_performance.yaml b/dsp/examples/riscv_tests/fft_demo/beaglev_fire/fft_performance.yaml
index 940e05d..fd76120 100644
--- a/dsp/examples/riscv_tests/fft_demo/beaglev_fire/fft_performance.yaml
+++ b/dsp/examples/riscv_tests/fft_demo/beaglev_fire/fft_performance.yaml
@@ -2,11 +2,15 @@
 HSS:
     type: git
     link: https://github.com/polarfire-soc/hart-software-services.git
-    branch: master
-    commit: v2025.03
+    branch: next
+    commit: af4f81a657c92601b0de2f52b89a3f97bbf4a2b3
+    make_clean: 0
 gateware:
-    top_level_name: shls_test
-    build-args: "M2_OPTION:NONE CAPE_OPTION:NONE SMARTHLS:../../../../../dsp/examples/riscv_tests/fft_demo/beaglev_fire"
     type: sources
-    unique-design-version:
-
+    build-args: "CAPE_OPTION:DEFAULT
+                   M2_OPTION:NONE
+             MIPI_CSI_OPTION:DEFAULT
+               SYZYGY_OPTION:DEFAULT
+                  APU_OPTION:SMARTHLS
+                      SHLS_0:../../../../../dsp/examples/riscv_tests/fft_demo/beaglev_fire"
+    unique-design-version: 7.0.0
diff --git a/dsp/examples/riscv_tests/fft_demo/sources/demo.cpp b/dsp/examples/riscv_tests/fft_demo/sources/demo.cpp
index 680f6a2..da69a59 100644
--- a/dsp/examples/riscv_tests/fft_demo/sources/demo.cpp
+++ b/dsp/examples/riscv_tests/fft_demo/sources/demo.cpp
@@ -11,7 +11,7 @@ using namespace hls;
 using namespace hls::dsp;
 
 #include "test_vector.h"
-#include "test_utils.hpp"
+#include "../../../test_utils.hpp"
 
 struct fft_buff_t {
   uint16_t im;
diff --git a/math/examples/riscv_tests/sin_performance/beaglev_fire/sin_performance.yaml b/math/examples/riscv_tests/sin_performance/beaglev_fire/sin_performance.yaml
index 65de39b..13fc20b 100644
--- a/math/examples/riscv_tests/sin_performance/beaglev_fire/sin_performance.yaml
+++ b/math/examples/riscv_tests/sin_performance/beaglev_fire/sin_performance.yaml
@@ -2,11 +2,15 @@
 HSS:
     type: git
     link: https://github.com/polarfire-soc/hart-software-services.git
-    branch: master
-    commit: v2025.03
+    branch: next
+    commit: af4f81a657c92601b0de2f52b89a3f97bbf4a2b3
+    make_clean: 0
 gateware:
-    top_level_name: shls_test
-    build-args: "M2_OPTION:NONE CAPE_OPTION:NONE SMARTHLS:../../../../../math/examples/riscv_tests/sin_performance/beaglev_fire"
     type: sources
-    unique-design-version:
-
+    build-args: "CAPE_OPTION:DEFAULT
+                   M2_OPTION:NONE
+             MIPI_CSI_OPTION:DEFAULT
+               SYZYGY_OPTION:DEFAULT
+                  APU_OPTION:SMARTHLS
+                      SHLS_0:../../../../../math/examples/riscv_tests/sin_performance/beaglev_fire"
+    unique-design-version: 7.0.0
diff --git a/math/examples/riscv_tests/sin_performance/sources/test.cpp b/math/examples/riscv_tests/sin_performance/sources/test.cpp
index dc2c5cf..09d3bd4 100644
--- a/math/examples/riscv_tests/sin_performance/sources/test.cpp
+++ b/math/examples/riscv_tests/sin_performance/sources/test.cpp
@@ -10,7 +10,7 @@ using namespace hls::math;
 
 #define THRESHOLD 0.1 // Error Threshold
 
-void hls_test(float n[__N_ELEM], float vals[__N_ELEM]){
+void sin_performance(float n[__N_ELEM], float vals[__N_ELEM]){
   #pragma HLS function top dataflow
   #pragma HLS interface default type(axi_target)
   #pragma HLS interface argument(vals) type(axi_initiator) num_elements(__N_ELEM)
@@ -60,7 +60,7 @@ int main(){
   double cmath1 = timestamp();
 
   double hls_math0 = timestamp();
-  hls_test(x, vals_fixpt);
+  sin_performance(x, vals_fixpt);
   double hls_math1 = timestamp();
 
   // Test accuracy of results:
diff --git a/support/beaglev-fire/gateware b/support/beaglev-fire/gateware
index 020b095..7659752 160000
--- a/support/beaglev-fire/gateware
+++ b/support/beaglev-fire/gateware
@@ -1 +1 @@
-Subproject commit 020b095d80dada7fa427125eb2fc1db07a1aad6d
+Subproject commit 76597520472177491d381ae8ba04453ad023b31e