diff --git a/tools/test/audio/process_test.m b/tools/test/audio/process_test.m
index ef04b0729..eb6bdb013 100644
--- a/tools/test/audio/process_test.m
+++ b/tools/test/audio/process_test.m
@@ -26,7 +26,7 @@ if nargin < 4
 end
 
 %% Paths
-t.blobpath = '../../topology/m4';
+t.blobpath = '../../topology/topology1/m4';
 plots = 'plots';
 reports = 'reports';
 
diff --git a/tools/tune/crossover/example_crossover.m b/tools/tune/crossover/example_crossover.m
index 3166f4a4f..72238fb3f 100644
--- a/tools/tune/crossover/example_crossover.m
+++ b/tools/tune/crossover/example_crossover.m
@@ -1,7 +1,7 @@
 function example_crossover();
 
 % Set the parameters here
-tplg_fn = "../../topology/m4/crossover_coef_default.m4" % Control Bytes File
+tplg_fn = "../../topology/topology1/m4/crossover_coef_default.m4" % Control Bytes File
 % Use those files with sof-ctl to update the component's configuration
 blob_fn = "../../ctl/crossover_coef.blob" % Blob binary file
 alsa_fn = "../../ctl/crossover_coef.txt" % ALSA CSV format file
diff --git a/tools/tune/dcblock/example_dcblock.m b/tools/tune/dcblock/example_dcblock.m
index 180b9b5e5..74490e5ab 100644
--- a/tools/tune/dcblock/example_dcblock.m
+++ b/tools/tune/dcblock/example_dcblock.m
@@ -1,7 +1,7 @@
 function example_dcblock();
 
 % Set the parameters here
-tplg_fn = "../../topology/m4/dcblock_coef_default.m4" % Control Bytes File
+tplg_fn = "../../topology/topology1/m4/dcblock_coef_default.m4" % Control Bytes File
 % Use those files with sof-ctl to update the component's configuration
 blob_fn = "../../ctl/dcblock_coef.blob" % Blob binary file
 alsa_fn = "../../ctl/dcblock_coef.txt" % ALSA CSV format file
diff --git a/tools/tune/drc/example_drc.m b/tools/tune/drc/example_drc.m
index accfb8d2d..580aede93 100644
--- a/tools/tune/drc/example_drc.m
+++ b/tools/tune/drc/example_drc.m
@@ -1,7 +1,7 @@
 function example_drc();
 
 % Set the parameters here
-tplg_fn = "../../topology/m4/drc_coef_default.m4"; % Control Bytes File
+tplg_fn = "../../topology/topology1/m4/drc_coef_default.m4"; % Control Bytes File
 % Use those files with sof-ctl to update the component's configuration
 blob_fn = "../../ctl/drc_coef.blob"; % Blob binary file
 alsa_fn = "../../ctl/drc_coef.txt"; % ALSA CSV format file
diff --git a/tools/tune/eq/example_fir_eq.m b/tools/tune/eq/example_fir_eq.m
index 6f3e730cc..053c64c96 100644
--- a/tools/tune/eq/example_fir_eq.m
+++ b/tools/tune/eq/example_fir_eq.m
@@ -10,7 +10,7 @@ function example_fir_eq()
 
 %% Common definitions
 fs = 48e3;
-tpath =  '../../topology/m4';
+tpath =  '../../topology/topology1/m4';
 cpath = '../../ctl';
 priv = 'DEF_EQFIR_PRIV';
 
diff --git a/tools/tune/eq/example_iir_eq.m b/tools/tune/eq/example_iir_eq.m
index c26314ff8..b4a52ee19 100644
--- a/tools/tune/eq/example_iir_eq.m
+++ b/tools/tune/eq/example_iir_eq.m
@@ -10,7 +10,7 @@ function example_iir_eq()
 
 %% Common definitions
 fs = 48e3;
-tpath =  '../../topology/m4';
+tpath =  '../../topology/topology1/m4';
 cpath = '../../ctl';
 priv = 'DEF_EQIIR_PRIV';
 
diff --git a/tools/tune/eq/example_spk_eq.m b/tools/tune/eq/example_spk_eq.m
index 1c8e12e06..fdc1f096a 100644
--- a/tools/tune/eq/example_spk_eq.m
+++ b/tools/tune/eq/example_spk_eq.m
@@ -15,7 +15,7 @@ function example_spk_eq()
 
 %% Defaults
 fs = 48e3;
-tpath =  '../../topology/m4';
+tpath =  '../../topology/topology1/m4';
 cpath = '../../ctl';
 iir_priv = 'DEF_EQIIR_PRIV';
 fir_priv = 'DEF_EQFIR_PRIV';
diff --git a/tools/tune/multiband_drc/example_multiband_drc.m b/tools/tune/multiband_drc/example_multiband_drc.m
index da8c43460..2594c3b86 100644
--- a/tools/tune/multiband_drc/example_multiband_drc.m
+++ b/tools/tune/multiband_drc/example_multiband_drc.m
@@ -1,7 +1,7 @@
 function example_multiband_drc();
 
 % Set the parameters here
-tplg_fn = "../../topology/m4/multiband_drc_coef_default.m4"; % Control Bytes File
+tplg_fn = "../../topology/topology1/m4/multiband_drc_coef_default.m4"; % Control Bytes File
 % Use those files with sof-ctl to update the component's configuration
 blob_fn = "../../ctl/multiband_drc_coef.blob"; % Blob binary file
 alsa_fn = "../../ctl/multiband_drc_coef.txt"; % ALSA CSV format file