diff --git a/tools/rimage/src/adsp_config.c b/tools/rimage/src/adsp_config.c
index 7dd30864ff54..5ce44a689826 100644
--- a/tools/rimage/src/adsp_config.c
+++ b/tools/rimage/src/adsp_config.c
@@ -1910,7 +1910,7 @@ static int parse_module(const toml_table_t *toml, struct parse_ctx *pctx,
 		if (ret < 0)
 			return err_key_parse("uuid", NULL);
 
-		parse_uuid(buf, mod_man->uuid);
+		parse_uuid(buf, &mod_man->uuid);
 
 		mod_man->affinity_mask = parse_uint32_hex_key(mod_entry, &ctx_entry,
 							      "affinity_mask", 1, &ret);
@@ -1952,7 +1952,7 @@ static int parse_module(const toml_table_t *toml, struct parse_ctx *pctx,
 		header->version_major = 2;
 		header->version_minor = 5;
 		header->ext_module_config_length = sizeof(struct fw_ext_mod_config_header);
-		memcpy(header->guid, mod_man->uuid, sizeof(mod_man->uuid));
+		memcpy(header->guid, &mod_man->uuid, sizeof(mod_man->uuid));
 
 		type = parse_uint32_hex_key(mod_entry, &ctx_entry, "module_type", 1, &ret);
 		if (ret < 0)
diff --git a/tools/rimage/src/manifest.c b/tools/rimage/src/manifest.c
index d7a1fbe58e4e..f0c92014ce00 100644
--- a/tools/rimage/src/manifest.c
+++ b/tools/rimage/src/manifest.c
@@ -205,7 +205,7 @@ static void man_get_section_manifest(struct image *image,
 	memcpy(man_module->struct_id, "$AME", 4);
 	man_module->entry_point = sof_mod->module.entry_point;
 	memcpy(man_module->name, sof_mod->module.name, SOF_MAN_MOD_NAME_LEN);
-	memcpy(man_module->uuid, sof_mod->module.uuid, 16);
+	memcpy(&man_module->uuid, &sof_mod->module.uuid, sizeof(man_module->uuid));
 	man_module->affinity_mask = sof_mod->module.affinity_mask;
 	man_module->instance_max_count = sof_mod->module.instance_max_count;
 	man_module->type.auto_start = sof_mod->module.type.auto_start;