diff --git a/scripts/west_commands/runners/intel_adsp.py b/scripts/west_commands/runners/intel_adsp.py
index 4a0c83c2f2c..cbaa106020d 100644
--- a/scripts/west_commands/runners/intel_adsp.py
+++ b/scripts/west_commands/runners/intel_adsp.py
@@ -16,7 +16,7 @@ from zephyr_ext_common import ZEPHYR_BASE
 DEFAULT_CAVSTOOL='soc/xtensa/intel_adsp/tools/cavstool_client.py'
 DEFAULT_SOF_MOD_DIR=os.path.join(ZEPHYR_BASE, '../modules/audio/sof')
 DEFAULT_RIMAGE_TOOL=shutil.which('rimage')
-DEFAULT_CONFIG_DIR=os.path.join(DEFAULT_SOF_MOD_DIR, 'rimage/config')
+DEFAULT_CONFIG_DIR=os.path.join(DEFAULT_SOF_MOD_DIR, 'tools/rimage/config')
 DEFAULT_KEY_DIR=os.path.join(DEFAULT_SOF_MOD_DIR, 'keys')
 
 
diff --git a/scripts/west_commands/sign.py b/scripts/west_commands/sign.py
index 87b8346884f..bdf9d353685 100644
--- a/scripts/west_commands/sign.py
+++ b/scripts/west_commands/sign.py
@@ -502,7 +502,7 @@ class RimageSigner(Signer):
         elif cache.get('RIMAGE_CONFIG_PATH'):
             conf_dir = pathlib.Path(cache['RIMAGE_CONFIG_PATH'])
         else:
-            conf_dir = sof_src_dir / 'rimage' / 'config'
+            conf_dir = sof_src_dir / 'tools' / 'rimage' / 'config'
 
         conf_path_cmd = ['-c', str(conf_dir / cmake_toml)] if conf_dir else []
 
diff --git a/submanifests/optional.yaml b/submanifests/optional.yaml
index b6a913c41ac..dbcfc363737 100644
--- a/submanifests/optional.yaml
+++ b/submanifests/optional.yaml
@@ -28,7 +28,7 @@ manifest:
       groups:
         - optional
     - name: sof
-      revision: c0f20b69daa44e3563f970b366e49ccfcfa1b71c
+      revision: e7cb489d430dc2181e4a5f7f953ed1eaeec6668d
       path: modules/audio/sof
       remote: upstream
       groups: