diff --git a/src/audio/aria/aria.c b/src/audio/aria/aria.c
index 437ca672b20c..7f3d3e5e10f8 100644
--- a/src/audio/aria/aria.c
+++ b/src/audio/aria/aria.c
@@ -32,9 +32,7 @@
 LOG_MODULE_REGISTER(aria, CONFIG_SOF_LOG_LEVEL);
 
 /* these ids aligns windows driver requirement to support windows driver */
-/* 99f7166d-372c-43ef-81f6-22007aa15f03 */
-SOF_DEFINE_UUID("aria", aria_uuid, 0x99f7166d, 0x372c, 0x43ef,
-		    0x81, 0xf6, 0x22, 0x00, 0x7a, 0xa1, 0x5f, 0x03);
+SOF_DEFINE_REG_UUID(aria);
 
 DECLARE_TR_CTX(aria_comp_tr, SOF_UUID(aria_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/asrc/asrc_ipc3.c b/src/audio/asrc/asrc_ipc3.c
index f7e6ac5b3379..ef002e1b0310 100644
--- a/src/audio/asrc/asrc_ipc3.c
+++ b/src/audio/asrc/asrc_ipc3.c
@@ -16,9 +16,7 @@
 #include <errno.h>
 #include "asrc.h"
 
-/* c8ec72f6-8526-4faf-9d39-a23d0b541de2 */
-SOF_DEFINE_UUID("asrc", asrc_uuid, 0xc8ec72f6, 0x8526, 0x4faf,
-		    0x9d, 0x39, 0xa2, 0x3d, 0x0b, 0x54, 0x1d, 0xe2);
+SOF_DEFINE_REG_UUID(asrc);
 
 DECLARE_TR_CTX(asrc_tr, SOF_UUID(asrc_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/asrc/asrc_ipc4.c b/src/audio/asrc/asrc_ipc4.c
index a59086087f98..9caf3a898e12 100644
--- a/src/audio/asrc/asrc_ipc4.c
+++ b/src/audio/asrc/asrc_ipc4.c
@@ -16,9 +16,7 @@
 #include <errno.h>
 #include "asrc.h"
 
-/* 66b4402d-b468-42f2-81a7-b37121863dd4 */
-SOF_DEFINE_UUID("asrc4", asrc4_uuid, 0x66b4402d, 0xb468, 0x42f2,
-		    0x81, 0xa7, 0xb3, 0x71, 0x21, 0x86, 0x3d, 0xd4);
+SOF_DEFINE_REG_UUID(asrc4);
 
 DECLARE_TR_CTX(asrc_tr, SOF_UUID(asrc4_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/base_fw.c b/src/audio/base_fw.c
index 7d2b6acfb85a..f8919a6e04ab 100644
--- a/src/audio/base_fw.c
+++ b/src/audio/base_fw.c
@@ -36,9 +36,7 @@
 
 LOG_MODULE_REGISTER(basefw, CONFIG_SOF_LOG_LEVEL);
 
-/* 0e398c32-5ade-ba4b-93b1-c50432280ee4 */
-SOF_DEFINE_UUID("basefw", basefw_uuid, 0xe398c32, 0x5ade, 0xba4b,
-		    0x93, 0xb1, 0xc5, 0x04, 0x32, 0x28, 0x0e, 0xe4);
+SOF_DEFINE_REG_UUID(basefw);
 DECLARE_TR_CTX(basefw_comp_tr, SOF_UUID(basefw_uuid), LOG_LEVEL_INFO);
 
 static struct ipc4_system_time_info global_system_time_info;
diff --git a/src/audio/buffer.c b/src/audio/buffer.c
index 2d9d97864aa3..05affe47a32d 100644
--- a/src/audio/buffer.c
+++ b/src/audio/buffer.c
@@ -27,9 +27,7 @@
 
 LOG_MODULE_REGISTER(buffer, CONFIG_SOF_LOG_LEVEL);
 
-/* 42544c92-8e92-4e41-b679-34519f1c1d28 */
-SOF_DEFINE_UUID("buffer", buffer_uuid, 0x42544c92, 0x8e92, 0x4e41,
-		 0xb6, 0x79, 0x34, 0x51, 0x9f, 0x1c, 0x1d, 0x28);
+SOF_DEFINE_REG_UUID(buffer);
 DECLARE_TR_CTX(buffer_tr, SOF_UUID(buffer_uuid), LOG_LEVEL_INFO);
 
 static struct comp_buffer *buffer_alloc_struct(void *stream_addr, size_t size, uint32_t caps,
diff --git a/src/audio/chain_dma.c b/src/audio/chain_dma.c
index c344c0da21a8..77081b962bb3 100644
--- a/src/audio/chain_dma.c
+++ b/src/audio/chain_dma.c
@@ -35,9 +35,7 @@ static const uint32_t max_chain_number = DAI_NUM_HDA_OUT + DAI_NUM_HDA_IN;
 
 LOG_MODULE_REGISTER(chain_dma, CONFIG_SOF_LOG_LEVEL);
 
-/* 6a0a274f-27cc-4afb-a3e7-3444723f432e */
-SOF_DEFINE_UUID("chain_dma", chain_dma_uuid, 0x6a0a274f, 0x27cc, 0x4afb,
-		    0xa3, 0xe7, 0x34, 0x44, 0x72, 0x3f, 0x43, 0x2e);
+SOF_DEFINE_REG_UUID(chain_dma);
 DECLARE_TR_CTX(chain_dma_tr, SOF_UUID(chain_dma_uuid), LOG_LEVEL_INFO);
 
 /* chain dma component private data */
diff --git a/src/audio/channel_map.c b/src/audio/channel_map.c
index e71a0278b723..a2ef0a5528dc 100644
--- a/src/audio/channel_map.c
+++ b/src/audio/channel_map.c
@@ -16,9 +16,7 @@
 
 LOG_MODULE_REGISTER(channel_map, CONFIG_SOF_LOG_LEVEL);
 
-/* ec290e95-4a20-47eb-bbff-d9c888431831 */
-SOF_DEFINE_UUID("chmap", chmap_uuid, 0xec290e95, 0x4a20, 0x47eb,
-		 0xbb, 0xff, 0xd9, 0xc8, 0x88, 0x43, 0x18, 0x31);
+SOF_DEFINE_REG_UUID(chmap);
 
 DECLARE_TR_CTX(chmap_tr, SOF_UUID(chmap_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/codec/dts/dts.c b/src/audio/codec/dts/dts.c
index 50dbcfeb2b63..c6ef230d9be5 100644
--- a/src/audio/codec/dts/dts.c
+++ b/src/audio/codec/dts/dts.c
@@ -11,9 +11,7 @@
 
 LOG_MODULE_REGISTER(dts, CONFIG_SOF_LOG_LEVEL);
 
-/* d95fc34f-370f-4ac7-bc86-bfdc5be241e6 */
-SOF_DEFINE_UUID("dts", dts_uuid, 0xd95fc34f, 0x370f, 0x4ac7,
-			0xbc, 0x86, 0xbf, 0xdc, 0x5b, 0xe2, 0x41, 0xe6);
+SOF_DEFINE_REG_UUID(dts);
 DECLARE_TR_CTX(dts_tr, SOF_UUID(dts_uuid), LOG_LEVEL_INFO);
 
 #define MAX_EXPECTED_DTS_CONFIG_DATA_SIZE 8192
diff --git a/src/audio/component.c b/src/audio/component.c
index b763796bb9dd..f6c0f7fd7921 100644
--- a/src/audio/component.c
+++ b/src/audio/component.c
@@ -35,9 +35,7 @@ LOG_MODULE_REGISTER(component, CONFIG_SOF_LOG_LEVEL);
 
 static SHARED_DATA struct comp_driver_list cd;
 
-/* 7c42ce8b-0108-43d0-9137-56d660478c5f */
-SOF_DEFINE_UUID("component", component_uuid, 0x7c42ce8b, 0x0108, 0x43d0,
-		 0x91, 0x37, 0x56, 0xd6, 0x60, 0x47, 0x8c, 0x5f);
+SOF_DEFINE_REG_UUID(component);
 
 DECLARE_TR_CTX(comp_tr, SOF_UUID(component_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/copier/copier.c b/src/audio/copier/copier.c
index ac4d79fd8949..ad95d6309266 100644
--- a/src/audio/copier/copier.c
+++ b/src/audio/copier/copier.c
@@ -48,9 +48,7 @@
 LOG_MODULE_REGISTER(copier, CONFIG_SOF_LOG_LEVEL);
 
 /* this id aligns windows driver requirement to support windows driver */
-/* 9ba00c83-ca12-4a83-943c-1fa2e82f9dda */
-SOF_DEFINE_UUID("copier", copier_uuid, 0x9ba00c83, 0xca12, 0x4a83,
-		    0x94, 0x3c, 0x1f, 0xa2, 0xe8, 0x2f, 0x9d, 0xda);
+SOF_DEFINE_REG_UUID(copier);
 
 DECLARE_TR_CTX(copier_comp_tr, SOF_UUID(copier_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/copier/copier_ipcgtw.c b/src/audio/copier/copier_ipcgtw.c
index 4e411858eb15..cdac60e98249 100644
--- a/src/audio/copier/copier_ipcgtw.c
+++ b/src/audio/copier/copier_ipcgtw.c
@@ -13,9 +13,7 @@
 
 LOG_MODULE_REGISTER(ipcgtw, CONFIG_SOF_LOG_LEVEL);
 
-/* a814a1ca-0b83-466c-9587-2f35ff8d12e8 */
-SOF_DEFINE_UUID("ipcgw", ipcgw_uuid, 0xa814a1ca, 0x0b83, 0x466c,
-		    0x95, 0x87, 0x2f, 0x35, 0xff, 0x8d, 0x12, 0xe8);
+SOF_DEFINE_REG_UUID(ipcgw);
 
 DECLARE_TR_CTX(ipcgtw_comp_tr, SOF_UUID(ipcgw_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/crossover/crossover.c b/src/audio/crossover/crossover.c
index fc6ed9e5d7c3..9fffda1858c5 100644
--- a/src/audio/crossover/crossover.c
+++ b/src/audio/crossover/crossover.c
@@ -40,9 +40,7 @@
 
 LOG_MODULE_REGISTER(crossover, CONFIG_SOF_LOG_LEVEL);
 
-/* 948c9ad1-806a-4131-ad6c-b2bda9e35a9f */
-SOF_DEFINE_UUID("crossover", crossover_uuid, 0x948c9ad1, 0x806a, 0x4131,
-		    0xad, 0x6c, 0xb2, 0xbd, 0xa9, 0xe3, 0x5a, 0x9f);
+SOF_DEFINE_REG_UUID(crossover);
 
 DECLARE_TR_CTX(crossover_tr, SOF_UUID(crossover_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/dai-legacy.c b/src/audio/dai-legacy.c
index ec0683679e5b..273fa5eee9d5 100644
--- a/src/audio/dai-legacy.c
+++ b/src/audio/dai-legacy.c
@@ -39,9 +39,7 @@ static const struct comp_driver comp_dai;
 
 LOG_MODULE_REGISTER(dai_comp, CONFIG_SOF_LOG_LEVEL);
 
-/* c2b00d27-ffbc-4150-a51a-245c79c5e54b */
-SOF_DEFINE_UUID("dai", dai_uuid, 0xc2b00d27, 0xffbc, 0x4150,
-		 0xa5, 0x1a, 0x24, 0x5c, 0x79, 0xc5, 0xe5, 0x4b);
+SOF_DEFINE_REG_UUID(dai);
 
 DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/dai-zephyr.c b/src/audio/dai-zephyr.c
index 9ef0382a5a69..2dee890d9653 100644
--- a/src/audio/dai-zephyr.c
+++ b/src/audio/dai-zephyr.c
@@ -53,9 +53,7 @@ static const struct comp_driver comp_dai;
 
 LOG_MODULE_REGISTER(dai_comp, CONFIG_SOF_LOG_LEVEL);
 
-/* c2b00d27-ffbc-4150-a51a-245c79c5e54b */
-SOF_DEFINE_UUID("dai", dai_uuid, 0xc2b00d27, 0xffbc, 0x4150,
-		    0xa5, 0x1a, 0x24, 0x5c, 0x79, 0xc5, 0xe5, 0x4b);
+SOF_DEFINE_REG_UUID(dai);
 
 DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/dcblock/dcblock.c b/src/audio/dcblock/dcblock.c
index 8707623dbf00..6b7c23edd906 100644
--- a/src/audio/dcblock/dcblock.c
+++ b/src/audio/dcblock/dcblock.c
@@ -35,9 +35,7 @@
 
 LOG_MODULE_REGISTER(dcblock, CONFIG_SOF_LOG_LEVEL);
 
-/* b809efaf-5681-42b1-9ed6-04bb012dd384 */
-SOF_DEFINE_UUID("dcblock", dcblock_uuid, 0xb809efaf, 0x5681, 0x42b1,
-		 0x9e, 0xd6, 0x04, 0xbb, 0x01, 0x2d, 0xd3, 0x84);
+SOF_DEFINE_REG_UUID(dcblock);
 
 DECLARE_TR_CTX(dcblock_tr, SOF_UUID(dcblock_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/dp_queue.c b/src/audio/dp_queue.c
index 470b018707a2..dfa77c729b4d 100644
--- a/src/audio/dp_queue.c
+++ b/src/audio/dp_queue.c
@@ -14,9 +14,7 @@
 
 LOG_MODULE_REGISTER(dp_queue, CONFIG_SOF_LOG_LEVEL);
 
-/* 393608d8-4188-11ee-be56-0242ac120002 */
-SOF_DEFINE_UUID("dp_queue", dp_queue_uuid, 0x393608d8, 0x4188, 0x11ee,
-		    0xbe, 0x56, 0x02, 0x42, 0xac, 0x12, 0x20, 0x02);
+SOF_DEFINE_REG_UUID(dp_queue);
 DECLARE_TR_CTX(dp_queue_tr, SOF_UUID(dp_queue_uuid), LOG_LEVEL_INFO);
 
 static inline uint8_t __sparse_cache *dp_queue_buffer_end(struct dp_queue *dp_queue)
diff --git a/src/audio/drc/drc.c b/src/audio/drc/drc.c
index 1fc42fa8ca2d..cf7445165ec1 100644
--- a/src/audio/drc/drc.c
+++ b/src/audio/drc/drc.c
@@ -38,9 +38,7 @@
 
 LOG_MODULE_REGISTER(drc, CONFIG_SOF_LOG_LEVEL);
 
-/* b36ee4da-006f-47f9-a06d-fecbe2d8b6ce */
-SOF_DEFINE_UUID("drc", drc_uuid, 0xb36ee4da, 0x006f, 0x47f9,
-		    0xa0, 0x6d, 0xfe, 0xcb, 0xe2, 0xd8, 0xb6, 0xce);
+SOF_DEFINE_REG_UUID(drc);
 
 DECLARE_TR_CTX(drc_tr, SOF_UUID(drc_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/eq_fir/eq_fir.c b/src/audio/eq_fir/eq_fir.c
index 67e3e6266c95..adf649743cea 100644
--- a/src/audio/eq_fir/eq_fir.c
+++ b/src/audio/eq_fir/eq_fir.c
@@ -40,9 +40,7 @@
 
 LOG_MODULE_REGISTER(eq_fir, CONFIG_SOF_LOG_LEVEL);
 
-/* 43a90ce7-f3a5-41df-ac06-ba98651ae6a3 */
-SOF_DEFINE_UUID("eq_fir", eq_fir_uuid, 0x43a90ce7, 0xf3a5, 0x41df,
-		 0xac, 0x06, 0xba, 0x98, 0x65, 0x1a, 0xe6, 0xa3);
+SOF_DEFINE_REG_UUID(eq_fir);
 
 DECLARE_TR_CTX(eq_fir_tr, SOF_UUID(eq_fir_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/eq_iir/eq_iir.c b/src/audio/eq_iir/eq_iir.c
index 54f1311d050c..f81a943a7928 100644
--- a/src/audio/eq_iir/eq_iir.c
+++ b/src/audio/eq_iir/eq_iir.c
@@ -37,9 +37,7 @@
 
 LOG_MODULE_REGISTER(eq_iir, CONFIG_SOF_LOG_LEVEL);
 
-/* 5150c0e6-27f9-4ec8-8351-c705b642d12f */
-SOF_DEFINE_UUID("eq_iir", eq_iir_uuid, 0x5150c0e6, 0x27f9, 0x4ec8,
-		 0x83, 0x51, 0xc7, 0x05, 0xb6, 0x42, 0xd1, 0x2f);
+SOF_DEFINE_REG_UUID(eq_iir);
 
 DECLARE_TR_CTX(eq_iir_tr, SOF_UUID(eq_iir_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/google/google_hotword_detect.c b/src/audio/google/google_hotword_detect.c
index 16e63cee7ca9..c79d5917c432 100644
--- a/src/audio/google/google_hotword_detect.c
+++ b/src/audio/google/google_hotword_detect.c
@@ -44,10 +44,7 @@ static const struct comp_driver ghd_driver;
 
 LOG_MODULE_REGISTER(google_hotword_detect, CONFIG_SOF_LOG_LEVEL);
 
-/* c3c74249-058e-414f-8240-4da5f3fc2389 */
-SOF_DEFINE_UUID("google_hotword", google_hotword_uuid,
-		    0xc3c74249, 0x058e, 0x414f,
-		    0x82, 0x40, 0x4d, 0xa5, 0xf3, 0xfc, 0x23, 0x89);
+SOF_DEFINE_REG_UUID(google_hotword);
 DECLARE_TR_CTX(ghd_tr, SOF_UUID(ghd_uuid), LOG_LEVEL_INFO);
 
 struct comp_data {
diff --git a/src/audio/google/google_rtc_audio_processing.c b/src/audio/google/google_rtc_audio_processing.c
index 792c6f31c40b..cc5dc1bb6983 100644
--- a/src/audio/google/google_rtc_audio_processing.c
+++ b/src/audio/google/google_rtc_audio_processing.c
@@ -55,10 +55,7 @@
 
 LOG_MODULE_REGISTER(google_rtc_audio_processing, CONFIG_SOF_LOG_LEVEL);
 
-/* b780a0a6-269f-466f-b477-23dfa05af758 */
-SOF_DEFINE_UUID("google_rtc_audio_processing", google_rtc_audio_processing_uuid,
-					0xb780a0a6, 0x269f, 0x466f, 0xb4, 0x77, 0x23, 0xdf, 0xa0,
-					0x5a, 0xf7, 0x58);
+SOF_DEFINE_REG_UUID(google_rtc_audio_processing);
 
 DECLARE_TR_CTX(google_rtc_audio_processing_tr, SOF_UUID(google_rtc_audio_processing_uuid),
 			   LOG_LEVEL_INFO);
diff --git a/src/audio/host-legacy.c b/src/audio/host-legacy.c
index 4f9266915c8b..9c52c5bd85ab 100644
--- a/src/audio/host-legacy.c
+++ b/src/audio/host-legacy.c
@@ -38,9 +38,7 @@ static const struct comp_driver comp_host;
 
 LOG_MODULE_REGISTER(host, CONFIG_SOF_LOG_LEVEL);
 
-/* 8b9d100c-6d78-418f-90a3-e0e805d0852b */
-SOF_DEFINE_UUID("host", host_uuid, 0x8b9d100c, 0x6d78, 0x418f,
-		 0x90, 0xa3, 0xe0, 0xe8, 0x05, 0xd0, 0x85, 0x2b);
+SOF_DEFINE_REG_UUID(host);
 
 DECLARE_TR_CTX(host_tr, SOF_UUID(host_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/host-zephyr.c b/src/audio/host-zephyr.c
index a83da7fe1713..fa72b95557a8 100644
--- a/src/audio/host-zephyr.c
+++ b/src/audio/host-zephyr.c
@@ -39,9 +39,7 @@ static const struct comp_driver comp_host;
 
 LOG_MODULE_REGISTER(host_comp, CONFIG_SOF_LOG_LEVEL);
 
-/* 8b9d100c-6d78-418f-90a3-e0e805d0852b */
-SOF_DEFINE_UUID("host", host_uuid, 0x8b9d100c, 0x6d78, 0x418f,
-		    0x90, 0xa3, 0xe0, 0xe8, 0x05, 0xd0, 0x85, 0x2b);
+SOF_DEFINE_REG_UUID(host);
 
 DECLARE_TR_CTX(host_tr, SOF_UUID(host_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/igo_nr/igo_nr.c b/src/audio/igo_nr/igo_nr.c
index 77bb598c70a0..7475511a7595 100644
--- a/src/audio/igo_nr/igo_nr.c
+++ b/src/audio/igo_nr/igo_nr.c
@@ -44,9 +44,7 @@ enum IGO_NR_ENUM {
 
 LOG_MODULE_REGISTER(igo_nr, CONFIG_SOF_LOG_LEVEL);
 
-/* 696ae2bc-2877-11eb-adc1-0242ac120002 */
-SOF_DEFINE_UUID("igo_nr", igo_nr_uuid,  0x696ae2bc, 0x2877, 0x11eb, 0xad, 0xc1,
-		    0x02, 0x42, 0xac, 0x12, 0x00, 0x02);
+SOF_DEFINE_REG_UUID(igo_nr);
 
 DECLARE_TR_CTX(igo_nr_tr, SOF_UUID(igo_nr_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/kpb.c b/src/audio/kpb.c
index 3ab74d4ec97f..542984e88867 100644
--- a/src/audio/kpb.c
+++ b/src/audio/kpb.c
@@ -59,22 +59,16 @@ static const struct comp_driver comp_kpb;
 
 LOG_MODULE_REGISTER(kpb, CONFIG_SOF_LOG_LEVEL);
 #if CONFIG_IPC_MAJOR_4
-/* A8A0CB32-4A77-4DB1-85C7-53D7EE07BCE6 */
-SOF_DEFINE_UUID("kpb4", kpb4_uuid, 0xA8A0CB32, 0x4A77, 0x4DB1,
-		    0x85, 0xC7, 0x53, 0xD7, 0xEE, 0x07, 0xBC, 0xE6);
+SOF_DEFINE_REG_UUID(kpb4);
 #define KPB_UUID kpb4_uuid
 #else
-/* d8218443-5ff3-4a4c-b388-6cfe07b9562e */
-SOF_DEFINE_UUID("kpb", kpb_uuid, 0xd8218443, 0x5ff3, 0x4a4c,
-		    0xb3, 0x88, 0x6c, 0xfe, 0x07, 0xb9, 0x56, 0x2e);
+SOF_DEFINE_REG_UUID(kpb);
 #define KPB_UUID kpb_uuid
 #endif
 
 DECLARE_TR_CTX(kpb_tr, SOF_UUID(KPB_UUID), LOG_LEVEL_INFO);
 
-/* e50057a5-8b27-4db4-bd79-9a639cee5f50 */
-SOF_DEFINE_UUID("kpb_task", kpb_task_uuid, 0xe50057a5, 0x8b27, 0x4db4,
-		 0xbd, 0x79, 0x9a, 0x63, 0x9c, 0xee, 0x5f, 0x50);
+SOF_DEFINE_REG_UUID(kpb_task);
 
 /* KPB private data, runtime data */
 struct comp_data {
diff --git a/src/audio/mfcc/mfcc.c b/src/audio/mfcc/mfcc.c
index 932066fc58ce..ab609ce66cd4 100644
--- a/src/audio/mfcc/mfcc.c
+++ b/src/audio/mfcc/mfcc.c
@@ -34,9 +34,7 @@
 
 LOG_MODULE_REGISTER(mfcc, CONFIG_SOF_LOG_LEVEL);
 
-/* db10a773-1aa4-4cea-a21f-2d57a5c982eb */
-SOF_DEFINE_UUID("mfcc", mfcc_uuid, 0xdb10a773, 0x1aa4, 0x4cea,
-		    0xa2, 0x1f, 0x2d, 0x57, 0xa5, 0xc9, 0x82, 0xeb);
+SOF_DEFINE_REG_UUID(mfcc);
 
 DECLARE_TR_CTX(mfcc_tr, SOF_UUID(mfcc_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/mixer/mixer.c b/src/audio/mixer/mixer.c
index debf35f650a1..6e9d6acf4493 100644
--- a/src/audio/mixer/mixer.c
+++ b/src/audio/mixer/mixer.c
@@ -35,9 +35,7 @@
 
 LOG_MODULE_REGISTER(mixer, CONFIG_SOF_LOG_LEVEL);
 
-/* bc06c037-12aa-417c-9a97-89282e321a76 */
-SOF_DEFINE_UUID("mixer", mixer_uuid, 0xbc06c037, 0x12aa, 0x417c,
-		 0x9a, 0x97, 0x89, 0x28, 0x2e, 0x32, 0x1a, 0x76);
+SOF_DEFINE_REG_UUID(mixer);
 
 DECLARE_TR_CTX(mixer_tr, SOF_UUID(mixer_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/mixin_mixout/mixin_mixout.c b/src/audio/mixin_mixout/mixin_mixout.c
index 711366652764..105ef9c8e131 100644
--- a/src/audio/mixin_mixout/mixin_mixout.c
+++ b/src/audio/mixin_mixout/mixin_mixout.c
@@ -34,13 +34,11 @@
 LOG_MODULE_REGISTER(mixin_mixout, CONFIG_SOF_LOG_LEVEL);
 
 /* mixin 39656eb2-3b71-4049-8d3f-f92cd5c43c09 */
-SOF_DEFINE_UUID("mixin", mixin_uuid, 0x39656eb2, 0x3b71, 0x4049,
-		    0x8d, 0x3f, 0xf9, 0x2c, 0xd5, 0xc4, 0x3c, 0x09);
+SOF_DEFINE_REG_UUID(mixin);
 DECLARE_TR_CTX(mixin_tr, SOF_UUID(mixin_uuid), LOG_LEVEL_INFO);
 
 /* mixout 3c56505a-24d7-418f-bddc-c1f5a3ac2ae0 */
-SOF_DEFINE_UUID("mixout", mixout_uuid, 0x3c56505a, 0x24d7, 0x418f,
-		    0xbd, 0xdc, 0xc1, 0xf5, 0xa3, 0xac, 0x2a, 0xe0);
+SOF_DEFINE_REG_UUID(mixout);
 DECLARE_TR_CTX(mixout_tr, SOF_UUID(mixout_uuid), LOG_LEVEL_INFO);
 
 #define MIXIN_MAX_SINKS IPC4_MIXIN_MODULE_MAX_OUTPUT_QUEUES
diff --git a/src/audio/module_adapter/module/cadence.c b/src/audio/module_adapter/module/cadence.c
index 1e5c3d0beaa3..31b4d9ddc6c6 100644
--- a/src/audio/module_adapter/module/cadence.c
+++ b/src/audio/module_adapter/module/cadence.c
@@ -18,9 +18,7 @@
 
 LOG_MODULE_REGISTER(cadence, CONFIG_SOF_LOG_LEVEL);
 
-/* d8218443-5ff3-4a4c-b388-6cfe07b956aa */
-SOF_DEFINE_UUID("cadence_codec", cadence_codec_uuid, 0xd8218443, 0x5ff3, 0x4a4c,
-		    0xb3, 0x88, 0x6c, 0xfe, 0x07, 0xb9, 0x56, 0xaa);
+SOF_DEFINE_REG_UUID(cadence_codec);
 
 DECLARE_TR_CTX(cadence_tr, SOF_UUID(cadence_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/module_adapter/module/modules.c b/src/audio/module_adapter/module/modules.c
index bbc511db4c79..9ad88d5a5bb7 100644
--- a/src/audio/module_adapter/module/modules.c
+++ b/src/audio/module_adapter/module/modules.c
@@ -42,9 +42,7 @@
  */
 
 LOG_MODULE_REGISTER(sof_modules, CONFIG_SOF_LOG_LEVEL);
-/* ee2585f2-e7d8-43dc-90ab-4224e00c3e84 */
-SOF_DEFINE_UUID("modules", modules_uuid, 0xee2585f2, 0xe7d8, 0x43dc,
-		    0x90, 0xab, 0x42, 0x24, 0xe0, 0x0c, 0x3e, 0x84);
+SOF_DEFINE_REG_UUID(modules);
 DECLARE_TR_CTX(intel_codec_tr, SOF_UUID(modules_uuid), LOG_LEVEL_INFO);
 
 /**
diff --git a/src/audio/module_adapter/module/passthrough.c b/src/audio/module_adapter/module/passthrough.c
index 6227ec05f080..2cd5846e7393 100644
--- a/src/audio/module_adapter/module/passthrough.c
+++ b/src/audio/module_adapter/module/passthrough.c
@@ -11,9 +11,7 @@
 
 LOG_MODULE_REGISTER(passthrough, CONFIG_SOF_LOG_LEVEL);
 
-/* 376b5e44-9c82-4ec2-bc83-10ea101afa8f */
-SOF_DEFINE_UUID("passthrough", passthrough_uuid, 0x376b5e44, 0x9c82, 0x4ec2,
-		    0xbc, 0x83, 0x10, 0xea, 0x10, 0x1a, 0xf8, 0x8f);
+SOF_DEFINE_REG_UUID(passthrough);
 DECLARE_TR_CTX(passthrough_tr, SOF_UUID(passthrough_uuid), LOG_LEVEL_INFO);
 
 static int passthrough_codec_init(struct processing_module *mod)
diff --git a/src/audio/module_adapter/module/waves/waves.c b/src/audio/module_adapter/module/waves/waves.c
index 7e0528f2a55e..efa1780fd482 100644
--- a/src/audio/module_adapter/module/waves/waves.c
+++ b/src/audio/module_adapter/module/waves/waves.c
@@ -18,9 +18,7 @@
 #define MAX_CONFIG_SIZE_BYTES (8192)
 #define NUM_IO_STREAMS (1)
 
-/* d944281a-afe9-4695-a043-d7f62b89538e*/
-SOF_DEFINE_UUID("waves", waves_uuid, 0xd944281a, 0xafe9, 0x4695,
-		    0xa0, 0x43, 0xd7, 0xf6, 0x2b, 0x89, 0x53, 0x8e);
+SOF_DEFINE_REG_UUID(waves);
 DECLARE_TR_CTX(waves_tr, SOF_UUID(waves_uuid), LOG_LEVEL_INFO);
 
 struct waves_codec_data {
diff --git a/src/audio/multiband_drc/multiband_drc.c b/src/audio/multiband_drc/multiband_drc.c
index 5d0689024c6e..9f95f5b888f0 100644
--- a/src/audio/multiband_drc/multiband_drc.c
+++ b/src/audio/multiband_drc/multiband_drc.c
@@ -37,9 +37,7 @@
 
 LOG_MODULE_REGISTER(multiband_drc, CONFIG_SOF_LOG_LEVEL);
 
-/* 0d9f2256-8e4f-47b3-8448-239a334f1191 */
-SOF_DEFINE_UUID("multiband_drc", multiband_drc_uuid, 0x0d9f2256, 0x8e4f, 0x47b3,
-		    0x84, 0x48, 0x23, 0x9a, 0x33, 0x4f, 0x11, 0x91);
+SOF_DEFINE_REG_UUID(multiband_drc);
 
 DECLARE_TR_CTX(multiband_drc_tr, SOF_UUID(multiband_drc_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/mux/mux_ipc3.c b/src/audio/mux/mux_ipc3.c
index ffba42b4ba33..e5f44c781da7 100644
--- a/src/audio/mux/mux_ipc3.c
+++ b/src/audio/mux/mux_ipc3.c
@@ -22,15 +22,11 @@
 
 LOG_MODULE_DECLARE(muxdemux, CONFIG_SOF_LOG_LEVEL);
 
-/* c607ff4d-9cb6-49dc-b678-7da3c63ea557 */
-SOF_DEFINE_UUID("mux", mux_uuid, 0xc607ff4d, 0x9cb6, 0x49dc,
-		    0xb6, 0x78, 0x7d, 0xa3, 0xc6, 0x3e, 0xa5, 0x57);
+SOF_DEFINE_REG_UUID(mux);
 
 DECLARE_TR_CTX(mux_tr, SOF_UUID(mux_uuid), LOG_LEVEL_INFO);
 
-/* c4b26868-1430-470e-a089-15d1c77f851a */
-SOF_DEFINE_UUID("demux", demux_uuid, 0xc4b26868, 0x1430, 0x470e,
-		    0xa0, 0x89, 0x15, 0xd1, 0xc7, 0x7f, 0x85, 0x1a);
+SOF_DEFINE_REG_UUID(demux);
 
 DECLARE_TR_CTX(demux_tr, SOF_UUID(demux_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/mux/mux_ipc4.c b/src/audio/mux/mux_ipc4.c
index 063004ab3fbe..72c9e9e29c7d 100644
--- a/src/audio/mux/mux_ipc4.c
+++ b/src/audio/mux/mux_ipc4.c
@@ -23,15 +23,11 @@
 
 LOG_MODULE_DECLARE(muxdemux, CONFIG_SOF_LOG_LEVEL);
 
-/* 64ce6e35-857a-4878-ace8-e2a2f42e3069 */
-SOF_DEFINE_UUID("mux4", mux4_uuid, 0x64ce6e35, 0x857a, 0x4878,
-		    0xac, 0xe8, 0xe2, 0xa2, 0xf4, 0x2e, 0x30, 0x69);
+SOF_DEFINE_REG_UUID(mux4);
 
 DECLARE_TR_CTX(mux_tr, SOF_UUID(mux4_uuid), LOG_LEVEL_INFO);
 
-/* c4b26868-1430-470e-a089-15d1c77f851a */
-SOF_DEFINE_UUID("demux", demux_uuid, 0xc4b26868, 0x1430, 0x470e,
-		    0xa0, 0x89, 0x15, 0xd1, 0xc7, 0x7f, 0x85, 0x1a);
+SOF_DEFINE_REG_UUID(demux);
 
 DECLARE_TR_CTX(demux_tr, SOF_UUID(demux_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/pipeline/pipeline-graph.c b/src/audio/pipeline/pipeline-graph.c
index 7b8b56cbb1a6..42fbdc7bae8f 100644
--- a/src/audio/pipeline/pipeline-graph.c
+++ b/src/audio/pipeline/pipeline-graph.c
@@ -28,9 +28,7 @@
 
 LOG_MODULE_REGISTER(pipe, CONFIG_SOF_LOG_LEVEL);
 
-/* 4e934adb-b0ec-4d33-a086-c1022f921321 */
-SOF_DEFINE_UUID("pipe", pipe_uuid, 0x4e934adb, 0xb0ec, 0x4d33,
-		    0xa0, 0x86, 0xc1, 0x02, 0x2f, 0x92, 0x13, 0x21);
+SOF_DEFINE_REG_UUID(pipe);
 
 DECLARE_TR_CTX(pipe_tr, SOF_UUID(pipe_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/pipeline/pipeline-schedule.c b/src/audio/pipeline/pipeline-schedule.c
index c92477aa6f2b..b9f23e0d467a 100644
--- a/src/audio/pipeline/pipeline-schedule.c
+++ b/src/audio/pipeline/pipeline-schedule.c
@@ -29,15 +29,11 @@
 
 LOG_MODULE_DECLARE(pipe, CONFIG_SOF_LOG_LEVEL);
 
-/* f11818eb-e92e-4082-82a3-dc54c604ebb3 */
-SOF_DEFINE_UUID("pipe_task", pipe_task_uuid, 0xf11818eb, 0xe92e, 0x4082,
-		 0x82,  0xa3, 0xdc, 0x54, 0xc6, 0x04, 0xeb, 0xb3);
+SOF_DEFINE_REG_UUID(pipe_task);
 
 #if CONFIG_ZEPHYR_DP_SCHEDULER
 
-/* ee755917-96b9-4130-b49e-37b9d0501993 */
-SOF_DEFINE_UUID("dp_task", dp_task_uuid, 0xee755917, 0x96b9, 0x4130,
-		 0xb4,  0x9e, 0x37, 0xb9, 0xd0, 0x50, 0x19, 0x93);
+SOF_DEFINE_REG_UUID(dp_task);
 
 /**
  * current static stack size for each DP component
diff --git a/src/audio/rtnr/rtnr.c b/src/audio/rtnr/rtnr.c
index af3026e462ae..c12034b6e793 100644
--- a/src/audio/rtnr/rtnr.c
+++ b/src/audio/rtnr/rtnr.c
@@ -60,8 +60,7 @@ struct rtnr_func_map {
 LOG_MODULE_REGISTER(rtnr, CONFIG_SOF_LOG_LEVEL);
 
 /* UUID 5c7ca334-e15d-11eb-ba80-0242ac130004 */
-SOF_DEFINE_UUID("rtnr", rtnr_uuid, 0x5c7ca334, 0xe15d, 0x11eb, 0xba, 0x80,
-		    0x02, 0x42, 0xac, 0x13, 0x00, 0x04);
+SOF_DEFINE_REG_UUID(rtnr);
 
 DECLARE_TR_CTX(rtnr_tr, SOF_UUID(rtnr_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/selector/selector.c b/src/audio/selector/selector.c
index be22b761c73f..2839c9e72f98 100644
--- a/src/audio/selector/selector.c
+++ b/src/audio/selector/selector.c
@@ -42,14 +42,10 @@ LOG_MODULE_REGISTER(selector, CONFIG_SOF_LOG_LEVEL);
 #if CONFIG_IPC_MAJOR_3
 static const struct comp_driver comp_selector;
 
-/* 55a88ed5-3d18-46ca-88f1-0ee6eae9930f */
-SOF_DEFINE_UUID("selector", selector_uuid, 0x55a88ed5, 0x3d18, 0x46ca,
-		    0x88, 0xf1, 0x0e, 0xe6, 0xea, 0xe9, 0x93, 0x0f);
+SOF_DEFINE_REG_UUID(selector);
 #define SELECTOR_UUID selector_uuid
 #else
-/* 32fe92c1-1e17-4fc2-9758-c7f3542e980a */
-SOF_DEFINE_UUID("selector4", selector4_uuid, 0x32fe92c1, 0x1e17, 0x4fc2,
-		    0x97, 0x58, 0xc7, 0xf3, 0x54, 0x2e, 0x98, 0x0a);
+SOF_DEFINE_REG_UUID(selector4);
 #define SELECTOR_UUID selector4_uuid
 #endif
 
diff --git a/src/audio/smart_amp/smart_amp.c b/src/audio/smart_amp/smart_amp.c
index 4a9d2416bc32..3150d3df1dc9 100644
--- a/src/audio/smart_amp/smart_amp.c
+++ b/src/audio/smart_amp/smart_amp.c
@@ -24,15 +24,11 @@ static const struct comp_driver comp_smart_amp;
  * depending on configuration!
  */
 #if CONFIG_MAXIM_DSM
-/* 0cd84e80-ebd3-11ea-adc1-0242ac120002 */
-SOF_DEFINE_UUID("maxim_dsm", maxim_dsm_uuid, 0x0cd84e80, 0xebd3,
-		    0x11ea, 0xad, 0xc1, 0x02, 0x42, 0xac, 0x12, 0x00, 0x02);
+SOF_DEFINE_REG_UUID(maxim_dsm);
 #define UUID_SYM maxim_dsm_uuid
 
 #else /* Passthrough */
-/* 64a794f0-55d3-4bca-9d5b-7b588badd037 */
-SOF_DEFINE_UUID("passthru_smart_amp", passthru_smart_amp_uuid, 0x64a794f0, 0x55d3,
-		    0x4bca, 0x9d, 0x5b, 0x7b, 0x58, 0x8b, 0xad, 0xd0, 0x37);
+SOF_DEFINE_REG_UUID(passthru_smart_amp);
 #define UUID_SYM passthru_smart_amp
 
 #endif
diff --git a/src/audio/src/src_ipc3.c b/src/audio/src/src_ipc3.c
index 46bebf7b43b6..7cc43cdfb265 100644
--- a/src/audio/src/src_ipc3.c
+++ b/src/audio/src/src_ipc3.c
@@ -41,9 +41,7 @@
 #include "src.h"
 #include "src_config.h"
 
-/* c1c5326d-8390-46b4-aa47-95c3beca6550 */
-SOF_DEFINE_UUID("src", src_uuid, 0xc1c5326d, 0x8390, 0x46b4,
-		    0xaa, 0x47, 0x95, 0xc3, 0xbe, 0xca, 0x65, 0x50);
+SOF_DEFINE_REG_UUID(src);
 
 DECLARE_TR_CTX(src_tr, SOF_UUID(src_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/src/src_ipc4.c b/src/audio/src/src_ipc4.c
index aea0042dc2b2..9d78fef6a6b5 100644
--- a/src/audio/src/src_ipc4.c
+++ b/src/audio/src/src_ipc4.c
@@ -41,9 +41,7 @@
 #include "src.h"
 #include "src_config.h"
 
-/* e61bb28d-149a-4c1f-b709-46823ef5f5a3 */
-SOF_DEFINE_UUID("src4", src4_uuid, 0xe61bb28d, 0x149a, 0x4c1f,
-		    0xb7, 0x09, 0x46, 0x82, 0x3e, 0xf5, 0xf5, 0xae);
+SOF_DEFINE_REG_UUID(src4);
 
 DECLARE_TR_CTX(src_tr, SOF_UUID(src4_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/src/src_lite.c b/src/audio/src/src_lite.c
index 7a8f513f1eb1..184194be6079 100644
--- a/src/audio/src/src_lite.c
+++ b/src/audio/src/src_lite.c
@@ -60,8 +60,7 @@ static const struct module_interface src_lite_interface = {
 	.free = src_free,
 };
 
-SOF_DEFINE_UUID("src_lite", src_lite_uuid, 0x33441051, 0x44CD, 0x466A,
-		    0x83, 0xA3, 0x17, 0x84, 0x78, 0x70, 0x8A, 0xEA);
+SOF_DEFINE_REG_UUID(src_lite);
 
 DECLARE_TR_CTX(src_lite_tr, SOF_UUID(src_lite_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/tdfb/tdfb.c b/src/audio/tdfb/tdfb.c
index ddeaa7da0002..128a39b19e1c 100644
--- a/src/audio/tdfb/tdfb.c
+++ b/src/audio/tdfb/tdfb.c
@@ -43,9 +43,7 @@
 
 LOG_MODULE_REGISTER(tdfb, CONFIG_SOF_LOG_LEVEL);
 
-/* dd511749-d9fa-455c-b3a7-13585693f1af */
-SOF_DEFINE_UUID("tdfb", tdfb_uuid,  0xdd511749, 0xd9fa, 0x455c, 0xb3, 0xa7,
-		    0x13, 0x58, 0x56, 0x93, 0xf1, 0xaf);
+SOF_DEFINE_REG_UUID(tdfb);
 
 DECLARE_TR_CTX(tdfb_tr, SOF_UUID(tdfb_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/tone.c b/src/audio/tone.c
index 311c877b2f6c..d1975029fa04 100644
--- a/src/audio/tone.c
+++ b/src/audio/tone.c
@@ -49,9 +49,7 @@ static const struct comp_driver comp_tone;
 
 LOG_MODULE_REGISTER(tone, CONFIG_SOF_LOG_LEVEL);
 
-/* 04e3f894-2c5c-4f2e-8dc1-694eeaab53fa */
-SOF_DEFINE_UUID("tone", tone_uuid, 0x04e3f894, 0x2c5c, 0x4f2e,
-		 0x8d, 0xc1, 0x69, 0x4e, 0xea, 0xab, 0x53, 0xfa);
+SOF_DEFINE_REG_UUID(tone);
 
 DECLARE_TR_CTX(tone_tr, SOF_UUID(tone_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/audio/up_down_mixer/up_down_mixer.c b/src/audio/up_down_mixer/up_down_mixer.c
index 4e8341b4e3cc..d96ce0d38cf7 100644
--- a/src/audio/up_down_mixer/up_down_mixer.c
+++ b/src/audio/up_down_mixer/up_down_mixer.c
@@ -32,9 +32,7 @@
 LOG_MODULE_REGISTER(up_down_mixer, CONFIG_SOF_LOG_LEVEL);
 
 /* these ids aligns windows driver requirement to support windows driver */
-/* 42f8060c-832f-4dbf-b247-51e961997b34 */
-SOF_DEFINE_UUID("up_down_mixer", up_down_mixer_uuid, 0x42f8060c, 0x832f,
-		    0x4dbf, 0xb2, 0x47, 0x51, 0xe9, 0x61, 0x99, 0x7b, 0x34);
+SOF_DEFINE_REG_UUID(up_down_mixer);
 
 DECLARE_TR_CTX(up_down_mixer_comp_tr, SOF_UUID(up_down_mixer_uuid),
 	       LOG_LEVEL_INFO);
diff --git a/src/audio/volume/volume_uuid.h b/src/audio/volume/volume_uuid.h
index 852be4f4680c..d68b0ab5b4cd 100644
--- a/src/audio/volume/volume_uuid.h
+++ b/src/audio/volume/volume_uuid.h
@@ -12,19 +12,13 @@
 #include <sof/trace/trace.h>
 
 #if CONFIG_IPC_MAJOR_3
-/* b77e677e-5ff4-4188-af14-fba8bdbf8682 */
-SOF_DEFINE_UUID("volume", volume_uuid, 0xb77e677e, 0x5ff4, 0x4188,
-		    0xaf, 0x14, 0xfb, 0xa8, 0xbd, 0xbf, 0x86, 0x82);
+SOF_DEFINE_REG_UUID(volume);
 #else
 /* these ids aligns windows driver requirement to support windows driver */
-/* 8a171323-94a3-4e1d-afe9-fe5dbaa4c393 */
-SOF_DEFINE_UUID("volume4", volume4_uuid, 0x8a171323, 0x94a3, 0x4e1d,
-		    0xaf, 0xe9, 0xfe, 0x5d, 0xba, 0xa4, 0xc3, 0x93);
+SOF_DEFINE_REG_UUID(volume4);
 #define volume_uuid volume4_uuid
 
-/* 61bca9a8-18d0-4a18-8e7b-2639219804b7 */
-SOF_DEFINE_UUID("gain", gain_uuid, 0x61bca9a8, 0x18d0, 0x4a18,
-		    0x8e, 0x7b, 0x26, 0x39, 0x21, 0x98, 0x04, 0xb7);
+SOF_DEFINE_REG_UUID(gain);
 
 DECLARE_TR_CTX(gain_tr, SOF_UUID(gain_uuid), LOG_LEVEL_INFO);
 #endif
diff --git a/src/drivers/amd/common/acp_bt_dai.c b/src/drivers/amd/common/acp_bt_dai.c
index 52d8ed74682e..0cb751cbbfe8 100644
--- a/src/drivers/amd/common/acp_bt_dai.c
+++ b/src/drivers/amd/common/acp_bt_dai.c
@@ -18,9 +18,7 @@
 #include <sof/lib/io.h>
 #include <platform/chip_offset_byte.h>
 
-/* 20865bfe-b833-4ff9-b22a-0482c3477497 */
-SOF_DEFINE_UUID("btdai", btdai_uuid, 0x20865bfe, 0xb833, 0x4ff9,
-		 0xb2, 0x2a, 0x04, 0x82, 0xc3, 0x47, 0x74, 0x97);
+SOF_DEFINE_REG_UUID(btdai);
 
 DECLARE_TR_CTX(btdai_tr, SOF_UUID(btdai_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/amd/common/acp_dma.c b/src/drivers/amd/common/acp_dma.c
index c328815fdccf..ba641c93c5b8 100644
--- a/src/drivers/amd/common/acp_dma.c
+++ b/src/drivers/amd/common/acp_dma.c
@@ -24,8 +24,7 @@
 #include <platform/acp_dma.h>
 #include <sof/probe/probe.h>
 
-SOF_DEFINE_UUID("acpdma", acpdma_uuid, 0x70f2d3f2, 0xcbb6, 0x4984,
-		 0xa2, 0xd8, 0x0d, 0xd5, 0x14, 0xb8, 0x0b, 0xc2);
+SOF_DEFINE_REG_UUID(acpdma);
 DECLARE_TR_CTX(acpdma_tr, SOF_UUID(acpdma_uuid), LOG_LEVEL_INFO);
 #define PROBE_UPDATE_POS_MASK	0x80000000
 #define PROBE_BUFFER_WATERMARK	(16 * 1024)
diff --git a/src/drivers/amd/common/acp_dmic_dai.c b/src/drivers/amd/common/acp_dmic_dai.c
index 1041a7b368ab..bce741cd92d3 100644
--- a/src/drivers/amd/common/acp_dmic_dai.c
+++ b/src/drivers/amd/common/acp_dmic_dai.c
@@ -21,9 +21,7 @@
 
 extern struct acp_dmic_silence acp_initsilence;
 
-/*0ae40946-dfd2-4140-91-52-0d-d5-a3-ea-ae-81*/
-SOF_DEFINE_UUID("acp_dmic_dai", acp_dmic_dai_uuid, 0x0ae40946, 0xdfd2, 0x4140,
-		0x91, 0x52, 0x0d, 0xd5, 0xa3, 0xea, 0xae, 0x81);
+SOF_DEFINE_REG_UUID(acp_dmic_dai);
 
 DECLARE_TR_CTX(acp_dmic_dai_tr, SOF_UUID(acp_dmic_dai_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/amd/common/acp_dmic_dma.c b/src/drivers/amd/common/acp_dmic_dma.c
index 1a288fc8cef3..962ce7314c59 100644
--- a/src/drivers/amd/common/acp_dmic_dma.c
+++ b/src/drivers/amd/common/acp_dmic_dma.c
@@ -36,9 +36,7 @@
 extern uint32_t dmic_rngbuff_size;
 struct acp_dmic_silence acp_initsilence;
 
-/* dc2199ea-cdae-4d23-a413-ffe442f785f2 */
-SOF_DEFINE_UUID("acp_dmic_dma_common", acp_dmic_dma_common_uuid, 0xdc2199ea, 0xcdae, 0x4d23,
-		 0xa4, 0x13, 0xff, 0xe4, 0x42, 0xf7, 0x85, 0xf2);
+SOF_DEFINE_REG_UUID(acp_dmic_dma_common);
 DECLARE_TR_CTX(acp_dmic_dma_tr, SOF_UUID(acp_dmic_dma_common_uuid), LOG_LEVEL_INFO);
 
 /* allocate next free DMA channel */
diff --git a/src/drivers/amd/common/acp_sp_dma.c b/src/drivers/amd/common/acp_sp_dma.c
index 3f8c33505354..aaa40076c069 100644
--- a/src/drivers/amd/common/acp_sp_dma.c
+++ b/src/drivers/amd/common/acp_sp_dma.c
@@ -33,9 +33,7 @@
 #include <platform/chip_registers.h>
 #include <platform/acp_sp_dma.h>
 
-/* 2ef92c66-78a4-41f7-b52f-5539707a9382 */
-SOF_DEFINE_UUID("acp_sp_common", acp_sp_common_uuid, 0x2ef92c66, 0x78a4, 0x41f7,
-		 0xb5, 0x2f, 0x55, 0x39, 0x70, 0x7a, 0x93, 0x82);
+SOF_DEFINE_REG_UUID(acp_sp_common);
 DECLARE_TR_CTX(acp_sp_tr, SOF_UUID(acp_sp_common_uuid), LOG_LEVEL_INFO);
 
 /* allocate next free DMA channel */
diff --git a/src/drivers/amd/common/ipc.c b/src/drivers/amd/common/ipc.c
index 43d8057457b1..1b2330ff10c4 100644
--- a/src/drivers/amd/common/ipc.c
+++ b/src/drivers/amd/common/ipc.c
@@ -33,9 +33,7 @@
 #include <platform/platform.h>
 #include <platform/ipc.h>
 
-/* 49be8ff3-71a3-4456-bb7e-4723f2e5730c */
-SOF_DEFINE_UUID("ipc_task_amd", ipc_task_amd_uuid, 0x49be8ff3, 0x71a3, 0x4456,
-		 0xbb, 0x7e, 0x47, 0x23, 0xf2, 0xe5, 0x73, 0x0c);
+SOF_DEFINE_REG_UUID(ipc_task_amd);
 
 extern volatile acp_scratch_mem_config_t *pscratch_mem_cfg;
 
diff --git a/src/drivers/amd/rembrandt/acp_bt_dma.c b/src/drivers/amd/rembrandt/acp_bt_dma.c
index df8a66ced0db..4275a21331c7 100644
--- a/src/drivers/amd/rembrandt/acp_bt_dma.c
+++ b/src/drivers/amd/rembrandt/acp_bt_dma.c
@@ -32,9 +32,7 @@
 #include <platform/fw_scratch_mem.h>
 #include <platform/chip_registers.h>
 
-/* ee12fa71-4579-45d7-bde2-b32c6893a122 */
-SOF_DEFINE_UUID("acp_bt_dma", acp_bt_dma_uuid, 0xab01db67, 0x84b0, 0x4d2d,
-		0x93, 0xd3, 0x0e, 0x61, 0x96, 0x80, 0x57, 0x6e);
+SOF_DEFINE_REG_UUID(acp_bt_dma);
 
 DECLARE_TR_CTX(acp_bt_dma_tr, SOF_UUID(acp_bt_dma_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/amd/rembrandt/acp_dmic_dma.c b/src/drivers/amd/rembrandt/acp_dmic_dma.c
index 96025cfe7a7c..6801b907dd9b 100644
--- a/src/drivers/amd/rembrandt/acp_dmic_dma.c
+++ b/src/drivers/amd/rembrandt/acp_dmic_dma.c
@@ -33,9 +33,7 @@
 #include <platform/chip_registers.h>
 #include <platform/acp_dmic_dma.h>
 
-/* 109c7aba-a7ba-43c3-b9-42-59-e2-0a-66-11-be */
-SOF_DEFINE_UUID("acp_dmic_dma", acp_dmic_dma_uuid, 0x109c7aba, 0xa7ba, 0x43c3,
-		0xb9, 0x42, 0x59, 0xe2, 0x0a, 0x66, 0x11, 0xbe);
+SOF_DEFINE_REG_UUID(acp_dmic_dma);
 DECLARE_TR_CTX(acp_dmic_dma_rmb_tr, SOF_UUID(acp_dmic_dma_uuid), LOG_LEVEL_INFO);
 
 uint32_t dmic_rngbuff_size;
diff --git a/src/drivers/amd/rembrandt/acp_hs_dai.c b/src/drivers/amd/rembrandt/acp_hs_dai.c
index 9512fa12607c..56099d4c79cb 100644
--- a/src/drivers/amd/rembrandt/acp_hs_dai.c
+++ b/src/drivers/amd/rembrandt/acp_hs_dai.c
@@ -18,9 +18,7 @@
 #include <sof/lib/io.h>
 #include <platform/chip_offset_byte.h>
 
-/* 8f00c3bb-e835-4767-9a34-b8ec1041e56b */
-SOF_DEFINE_UUID("hsdai", hsdai_uuid, 0x8f00c3bb, 0xe835, 0x4767,
-		0x9a, 0x34, 0xb8, 0xec, 0x10, 0x41, 0xe5, 0x6b);
+SOF_DEFINE_REG_UUID(hsdai);
 DECLARE_TR_CTX(hsdai_tr, SOF_UUID(hsdai_uuid), LOG_LEVEL_INFO);
 
 static inline int hsdai_set_config(struct dai *dai, struct ipc_config_dai *common_config,
diff --git a/src/drivers/amd/rembrandt/acp_hs_dma.c b/src/drivers/amd/rembrandt/acp_hs_dma.c
index bcbab483de23..68b729af0fea 100644
--- a/src/drivers/amd/rembrandt/acp_hs_dma.c
+++ b/src/drivers/amd/rembrandt/acp_hs_dma.c
@@ -32,9 +32,7 @@
 #include <platform/fw_scratch_mem.h>
 #include <platform/chip_registers.h>
 
-/*b414df09-9e31-4c59-8657-7afc8deba70c*/
-SOF_DEFINE_UUID("acp_hs", acp_hs_uuid, 0xb414df09, 0x9e31, 0x4c59,
-		0x86, 0x57, 0x7a, 0xfc, 0x8d, 0xeb, 0xa7, 0x0c);
+SOF_DEFINE_REG_UUID(acp_hs);
 DECLARE_TR_CTX(acp_hs_tr, SOF_UUID(acp_hs_uuid), LOG_LEVEL_INFO);
 
 #define HS_FIFO_SIZE		512
diff --git a/src/drivers/amd/rembrandt/acp_sp_dai.c b/src/drivers/amd/rembrandt/acp_sp_dai.c
index d78ccf5c15e0..800fff08efcd 100644
--- a/src/drivers/amd/rembrandt/acp_sp_dai.c
+++ b/src/drivers/amd/rembrandt/acp_sp_dai.c
@@ -18,9 +18,7 @@
 #include <sof/lib/io.h>
 #include <platform/chip_offset_byte.h>
 
-/* 4abd71ba-8619-458a-b33f-160fc0cf809b */
-SOF_DEFINE_UUID("spdai", spdai_uuid, 0x4abd71ba, 0x8619, 0x458a,
-		0xb3, 0x3f, 0x16, 0x0f, 0xc0, 0xcf, 0x80, 0x9b);
+SOF_DEFINE_REG_UUID(spdai);
 DECLARE_TR_CTX(spdai_tr, SOF_UUID(spdai_uuid), LOG_LEVEL_INFO);
 
 static inline int spdai_set_config(struct dai *dai, struct ipc_config_dai *common_config,
diff --git a/src/drivers/amd/rembrandt/acp_sp_dma.c b/src/drivers/amd/rembrandt/acp_sp_dma.c
index 4e070b292afb..423e364e879f 100644
--- a/src/drivers/amd/rembrandt/acp_sp_dma.c
+++ b/src/drivers/amd/rembrandt/acp_sp_dma.c
@@ -33,9 +33,7 @@
 #include <platform/chip_registers.h>
 #include <platform/acp_sp_dma.h>
 
-/*3ac07334-41ce-4447-a2c5-dff0d1fa1392*/
-SOF_DEFINE_UUID("acp_sp", acp_sp_uuid, 0x3ac07334, 0x41ce, 0x4447,
-		0xa2, 0xc5, 0xdf, 0xf0, 0xd1, 0xfa, 0x13, 0x92);
+SOF_DEFINE_REG_UUID(acp_sp);
 DECLARE_TR_CTX(acp_sp_rmb_tr, SOF_UUID(acp_sp_uuid), LOG_LEVEL_INFO);
 
 #define SP_TX_FIFO_ADDR		(SP_FIFO_SIZE * 2)
diff --git a/src/drivers/amd/rembrandt/acp_sw_audio_dai.c b/src/drivers/amd/rembrandt/acp_sw_audio_dai.c
index c7e53b759e6e..5523a5717d20 100644
--- a/src/drivers/amd/rembrandt/acp_sw_audio_dai.c
+++ b/src/drivers/amd/rembrandt/acp_sw_audio_dai.c
@@ -9,9 +9,7 @@
 #include <sof/lib/uuid.h>
 #include <sof/trace/trace.h>
 
-/* eb0bd14b-7d5e-4dfa-bbe2-7762adb279f0 */
-SOF_DEFINE_UUID("swaudiodai", swaudiodai_uuid, 0xeb0bd14b, 0x7d5e, 0x4dfa,
-		0xbb, 0xe2, 0x77, 0x62, 0xad, 0xb2, 0x79, 0xf0);
+SOF_DEFINE_REG_UUID(swaudiodai);
 
 DECLARE_TR_CTX(swaudiodai_tr, SOF_UUID(swaudiodai_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/amd/rembrandt/acp_sw_audio_dma.c b/src/drivers/amd/rembrandt/acp_sw_audio_dma.c
index fdbdf447d6cb..a2a20f6aa820 100644
--- a/src/drivers/amd/rembrandt/acp_sw_audio_dma.c
+++ b/src/drivers/amd/rembrandt/acp_sw_audio_dma.c
@@ -14,9 +14,7 @@
 
 #ifdef CONFIG_ACP_6_3
 
-/* 5871f3ca-dd92-4edb-8a94-d651dd208b1e */
-SOF_DEFINE_UUID("acp_sw_audio", acp_sw_audio_uuid, 0x5871f3ca, 0xdd92, 0x4edb,
-		0x8a, 0x94, 0xd6, 0x51, 0xdd, 0x20, 0x8b, 0x1e);
+SOF_DEFINE_REG_UUID(acp_sw_audio);
 
 DECLARE_TR_CTX(acp_sw_audio_tr, SOF_UUID(acp_sw_audio_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/amd/rembrandt/interrupt.c b/src/drivers/amd/rembrandt/interrupt.c
index c012b6787592..e4b323e758af 100644
--- a/src/drivers/amd/rembrandt/interrupt.c
+++ b/src/drivers/amd/rembrandt/interrupt.c
@@ -25,9 +25,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-/*  6533d0eb-b785-4709-84f5-347c81720189*/
-SOF_DEFINE_UUID("irq_acp", irq_acp_uuid, 0x6533d0eb, 0xb785, 0x4709,
-		0x84, 0xf5, 0x34, 0x7c, 0x81, 0x72, 0x01, 0x89);
+SOF_DEFINE_REG_UUID(irq_acp);
 
 DECLARE_TR_CTX(acp_irq_tr, SOF_UUID(irq_acp_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/amd/renoir/acp_bt_dma.c b/src/drivers/amd/renoir/acp_bt_dma.c
index 819ebb939d4e..cab4d696ba46 100644
--- a/src/drivers/amd/renoir/acp_bt_dma.c
+++ b/src/drivers/amd/renoir/acp_bt_dma.c
@@ -33,9 +33,7 @@
 #include <platform/fw_scratch_mem.h>
 #include <platform/chip_registers.h>
 
-/* ee12fa71-4579-45d7-bde2-b32c6893a122 */
-SOF_DEFINE_UUID("acp_bt_dma", acp_bt_dma_uuid, 0xab01db67, 0x84b0, 0x4d2d,
-		0x93, 0xd3, 0x0e, 0x61, 0x96, 0x80, 0x57, 0x6e);
+SOF_DEFINE_REG_UUID(acp_bt_dma);
 
 DECLARE_TR_CTX(acp_bt_dma_tr, SOF_UUID(acp_bt_dma_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/amd/renoir/acp_dmic_dma.c b/src/drivers/amd/renoir/acp_dmic_dma.c
index e0974b46b7ac..797124ae2c99 100644
--- a/src/drivers/amd/renoir/acp_dmic_dma.c
+++ b/src/drivers/amd/renoir/acp_dmic_dma.c
@@ -33,8 +33,7 @@
 #include <platform/chip_registers.h>
 #include <platform/acp_dmic_dma.h>
 
-SOF_DEFINE_UUID("acp_dmic_dma", acp_dmic_dma_uuid, 0x109c7aba, 0xa7ba, 0x43c3,
-		0xb9, 0x42, 0x59, 0xe2, 0x0a, 0x66, 0x11, 0xbe);
+SOF_DEFINE_REG_UUID(acp_dmic_dma);
 DECLARE_TR_CTX(acp_dmic_dma_rn_tr, SOF_UUID(acp_dmic_dma_uuid), LOG_LEVEL_INFO);
 
 uint32_t dmic_rngbuff_size;
diff --git a/src/drivers/amd/renoir/acp_sp_dai.c b/src/drivers/amd/renoir/acp_sp_dai.c
index 7f3051b6a328..26932d00044a 100644
--- a/src/drivers/amd/renoir/acp_sp_dai.c
+++ b/src/drivers/amd/renoir/acp_sp_dai.c
@@ -19,9 +19,7 @@
 #include <sof/lib/io.h>
 #include <platform/chip_offset_byte.h>
 
-/* 4abd71ba-8619-458a-b33f-160fc0cf809b */
-SOF_DEFINE_UUID("spdai", spdai_uuid, 0x4abd71ba, 0x8619, 0x458a,
-		0xb3, 0x3f, 0x16, 0x0f, 0xc0, 0xcf, 0x80, 0x9b);
+SOF_DEFINE_REG_UUID(spdai);
 DECLARE_TR_CTX(spdai_tr, SOF_UUID(spdai_uuid), LOG_LEVEL_INFO);
 
 static inline int spdai_set_config(struct dai *dai, struct ipc_config_dai *common_config,
diff --git a/src/drivers/amd/renoir/acp_sp_dma.c b/src/drivers/amd/renoir/acp_sp_dma.c
index af3dca21249d..1877c9ab88c0 100644
--- a/src/drivers/amd/renoir/acp_sp_dma.c
+++ b/src/drivers/amd/renoir/acp_sp_dma.c
@@ -34,9 +34,7 @@
 #include <platform/chip_registers.h>
 #include <platform/acp_sp_dma.h>
 
-/*3ac07334-41ce-4447-a2c5-dff0d1fa1392*/
-SOF_DEFINE_UUID("acp_sp", acp_sp_uuid, 0x3ac07334, 0x41ce, 0x4447,
-		 0xa2, 0xc5, 0xdf, 0xf0, 0xd1, 0xfa, 0x13, 0x92);
+SOF_DEFINE_REG_UUID(acp_sp);
 DECLARE_TR_CTX(acp_sp_rn_tr, SOF_UUID(acp_sp_uuid), LOG_LEVEL_INFO);
 
 static uint64_t prev_tx_pos;
diff --git a/src/drivers/amd/renoir/interrupt.c b/src/drivers/amd/renoir/interrupt.c
index eb7f16eb717f..6327c792cdd8 100644
--- a/src/drivers/amd/renoir/interrupt.c
+++ b/src/drivers/amd/renoir/interrupt.c
@@ -26,9 +26,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-/*  6533d0eb-b785-4709-84f5-347c81720189*/
-SOF_DEFINE_UUID("irq_acp", irq_acp_uuid, 0x6533d0eb, 0xb785, 0x4709,
-		0x84, 0xf5, 0x34, 0x7c, 0x81, 0x72, 0x01, 0x89);
+SOF_DEFINE_REG_UUID(irq_acp);
 
 DECLARE_TR_CTX(acp_irq_tr, SOF_UUID(irq_acp_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/amd/vangogh/acp_bt_dma.c b/src/drivers/amd/vangogh/acp_bt_dma.c
index ceb5ea112312..1dee67b6b0ec 100644
--- a/src/drivers/amd/vangogh/acp_bt_dma.c
+++ b/src/drivers/amd/vangogh/acp_bt_dma.c
@@ -32,9 +32,7 @@
 #include <platform/fw_scratch_mem.h>
 #include <platform/chip_registers.h>
 
-/* ee12fa71-4579-45d7-bde2-b32c6893a122 */
-SOF_DEFINE_UUID("acp_bt_dma", acp_bt_dma_uuid, 0xab01db67, 0x84b0, 0x4d2d,
-		 0x93, 0xd3, 0x0e, 0x61, 0x96, 0x80, 0x57, 0x6e);
+SOF_DEFINE_REG_UUID(acp_bt_dma);
 
 DECLARE_TR_CTX(acp_bt_dma_tr, SOF_UUID(acp_bt_dma_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/amd/vangogh/acp_dmic_dma.c b/src/drivers/amd/vangogh/acp_dmic_dma.c
index 110eb9277b31..a802163a1847 100644
--- a/src/drivers/amd/vangogh/acp_dmic_dma.c
+++ b/src/drivers/amd/vangogh/acp_dmic_dma.c
@@ -33,8 +33,7 @@
 #include <platform/chip_registers.h>
 #include <platform/acp_dmic_dma.h>
 
-SOF_DEFINE_UUID("acp_dmic_dma", acp_dmic_dma_uuid, 0x109c7aba, 0xa7ba, 0x43c3,
-		 0xb9, 0x42, 0x59, 0xe2, 0x0a, 0x66, 0x11, 0xbe);
+SOF_DEFINE_REG_UUID(acp_dmic_dma);
 DECLARE_TR_CTX(acp_dmic_dma_vgh_tr, SOF_UUID(acp_dmic_dma_uuid), LOG_LEVEL_INFO);
 
 uint32_t dmic_rngbuff_size;
diff --git a/src/drivers/amd/vangogh/acp_hs_dai.c b/src/drivers/amd/vangogh/acp_hs_dai.c
index 8b05aace7bc9..13c72f5f65ef 100644
--- a/src/drivers/amd/vangogh/acp_hs_dai.c
+++ b/src/drivers/amd/vangogh/acp_hs_dai.c
@@ -18,9 +18,7 @@
 #include <sof/lib/io.h>
 #include <platform/chip_offset_byte.h>
 
-/* 8f00c3bb-e835-4767-9a34-b8ec1041e56b */
-SOF_DEFINE_UUID("hsdai", hsdai_uuid, 0x8f00c3bb, 0xe835, 0x4767,
-		 0x9a, 0x34, 0xb8, 0xec, 0x10, 0x41, 0xe5, 0x6b);
+SOF_DEFINE_REG_UUID(hsdai);
 DECLARE_TR_CTX(hsdai_tr, SOF_UUID(hsdai_uuid), LOG_LEVEL_INFO);
 
 static inline int hsdai_set_config(struct dai *dai, struct ipc_config_dai *common_config,
diff --git a/src/drivers/amd/vangogh/acp_hs_dma.c b/src/drivers/amd/vangogh/acp_hs_dma.c
index ac2d6239199a..532f53e32749 100644
--- a/src/drivers/amd/vangogh/acp_hs_dma.c
+++ b/src/drivers/amd/vangogh/acp_hs_dma.c
@@ -32,9 +32,7 @@
 #include <platform/fw_scratch_mem.h>
 #include <platform/chip_registers.h>
 
-/*b414df09-9e31-4c59-8657-7afc8deba70c*/
-SOF_DEFINE_UUID("acp_hs", acp_hs_uuid, 0xb414df09, 0x9e31, 0x4c59,
-		 0x86, 0x57, 0x7a, 0xfc, 0x8d, 0xeb, 0xa7, 0x0c);
+SOF_DEFINE_REG_UUID(acp_hs);
 DECLARE_TR_CTX(acp_hs_tr, SOF_UUID(acp_hs_uuid), LOG_LEVEL_INFO);
 
 #define HS_FIFO_SIZE		512
diff --git a/src/drivers/amd/vangogh/acp_sp_dai.c b/src/drivers/amd/vangogh/acp_sp_dai.c
index bc1ab38baa91..04754d2f82aa 100644
--- a/src/drivers/amd/vangogh/acp_sp_dai.c
+++ b/src/drivers/amd/vangogh/acp_sp_dai.c
@@ -18,9 +18,7 @@
 #include <sof/lib/io.h>
 #include <platform/chip_offset_byte.h>
 
-/* 4abd71ba-8619-458a-b33f-160fc0cf809b */
-SOF_DEFINE_UUID("spdai", spdai_uuid, 0x4abd71ba, 0x8619, 0x458a,
-		 0xb3, 0x3f, 0x16, 0x0f, 0xc0, 0xcf, 0x80, 0x9b);
+SOF_DEFINE_REG_UUID(spdai);
 DECLARE_TR_CTX(spdai_tr, SOF_UUID(spdai_uuid), LOG_LEVEL_INFO);
 
 static inline int spdai_set_config(struct dai *dai, struct ipc_config_dai *common_config,
diff --git a/src/drivers/amd/vangogh/acp_sp_dma.c b/src/drivers/amd/vangogh/acp_sp_dma.c
index c768afcec6f6..c0bc227e46ef 100644
--- a/src/drivers/amd/vangogh/acp_sp_dma.c
+++ b/src/drivers/amd/vangogh/acp_sp_dma.c
@@ -33,9 +33,7 @@
 #include <platform/chip_registers.h>
 #include <platform/acp_sp_dma.h>
 
-/*3ac07334-41ce-4447-a2c5-dff0d1fa1392*/
-SOF_DEFINE_UUID("acp_sp", acp_sp_uuid, 0x3ac07334, 0x41ce, 0x4447,
-		 0xa2, 0xc5, 0xdf, 0xf0, 0xd1, 0xfa, 0x13, 0x92);
+SOF_DEFINE_REG_UUID(acp_sp);
 DECLARE_TR_CTX(acp_sp_vgh_tr, SOF_UUID(acp_sp_uuid), LOG_LEVEL_INFO);
 
 /* Vangogh hw specific addr map */
diff --git a/src/drivers/amd/vangogh/interrupt.c b/src/drivers/amd/vangogh/interrupt.c
index 4c2bb13c439a..51b0b0e492fb 100644
--- a/src/drivers/amd/vangogh/interrupt.c
+++ b/src/drivers/amd/vangogh/interrupt.c
@@ -25,9 +25,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-/*  6533d0eb-b785-4709-84f5-347c81720189*/
-SOF_DEFINE_UUID("irq_acp", irq_acp_uuid, 0x6533d0eb, 0xb785, 0x4709,
-		 0x84, 0xf5, 0x34, 0x7c, 0x81, 0x72, 0x01, 0x89);
+SOF_DEFINE_REG_UUID(irq_acp);
 
 DECLARE_TR_CTX(acp_irq_tr, SOF_UUID(irq_acp_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/dw/dma.c b/src/drivers/dw/dma.c
index f9bbbf55d712..8edd898eb25a 100644
--- a/src/drivers/dw/dma.c
+++ b/src/drivers/dw/dma.c
@@ -46,9 +46,7 @@
 
 LOG_MODULE_REGISTER(dw_dma, CONFIG_SOF_LOG_LEVEL);
 
-/* 298873bc-d532-4d93-a540-95ee6bcf3456 */
-SOF_DEFINE_UUID("dw_dma", dw_dma_uuid, 0x298873bc, 0xd532, 0x4d93,
-		 0xa5, 0x40, 0x95, 0xee, 0x6b, 0xcf, 0x34, 0x56);
+SOF_DEFINE_REG_UUID(dw_dma);
 
 DECLARE_TR_CTX(dwdma_tr, SOF_UUID(dw_dma_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/dw/ssi-spi.c b/src/drivers/dw/ssi-spi.c
index 579631d6f6e7..2ed54fe8ceee 100644
--- a/src/drivers/dw/ssi-spi.c
+++ b/src/drivers/dw/ssi-spi.c
@@ -30,10 +30,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-/* a417b6fb-459d-4cf9-be65-d38dc9057b80 */
-SOF_DEFINE_UUID("spi_completion", spi_completion_uuid, 0xa417b6fb,
-		 0x459d, 0x4cf9,
-		 0xbe, 0x65, 0xd3, 0x8d, 0xc9, 0x05, 0x7b, 0x80);
+SOF_DEFINE_REG_UUID(spi_completion);
 
 #define	SPI_REG_CTRLR0		0x00
 #define	SPI_REG_CTRLR1		0x04
diff --git a/src/drivers/generic/dummy-dma.c b/src/drivers/generic/dummy-dma.c
index b238e02176fd..62112c6198f7 100644
--- a/src/drivers/generic/dummy-dma.c
+++ b/src/drivers/generic/dummy-dma.c
@@ -48,9 +48,7 @@
 
 LOG_MODULE_REGISTER(dummy_dma, CONFIG_SOF_LOG_LEVEL);
 
-/* f6d15ad3-b122-458c-ae9b-0ab0b5867aa0 */
-SOF_DEFINE_UUID("dummy_dma", dummy_dma_uuid, 0xf6d15ad3, 0xb122, 0x458c,
-		 0xae, 0x9b, 0x0a, 0xb0, 0xb5, 0x86, 0x7a, 0xa0);
+SOF_DEFINE_REG_UUID(dummy_dma);
 
 DECLARE_TR_CTX(ddma_tr, SOF_UUID(dummy_dma_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/imx/edma.c b/src/drivers/imx/edma.c
index c21f9ef72289..a7b75efab7d7 100644
--- a/src/drivers/imx/edma.c
+++ b/src/drivers/imx/edma.c
@@ -21,9 +21,7 @@
 
 LOG_MODULE_REGISTER(edma, CONFIG_SOF_LOG_LEVEL);
 
-/* 3d73a110-0930-457f-be51-34453e56287b */
-SOF_DEFINE_UUID("edma", edma_uuid, 0x3d73a110, 0x0930, 0x457f,
-		 0xbe, 0x51, 0x34, 0x45, 0x3e, 0x56, 0x28, 0x7b);
+SOF_DEFINE_REG_UUID(edma);
 
 DECLARE_TR_CTX(edma_tr, SOF_UUID(edma_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/imx/esai.c b/src/drivers/imx/esai.c
index cee507392c54..d917b814893d 100644
--- a/src/drivers/imx/esai.c
+++ b/src/drivers/imx/esai.c
@@ -20,9 +20,7 @@
 
 LOG_MODULE_REGISTER(esai, CONFIG_SOF_LOG_LEVEL);
 
-/* 889f6dcd-ddcd-4e05-aa5b-0d39f8bca961 */
-SOF_DEFINE_UUID("esai", esai_uuid, 0x889f6dcd, 0xddcd, 0x4e05,
-		 0xaa, 0x5b, 0x0d, 0x39, 0xf8, 0xbc, 0xa9, 0x61);
+SOF_DEFINE_REG_UUID(esai);
 
 DECLARE_TR_CTX(esai_tr, SOF_UUID(esai_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/imx/interrupt-generic.c b/src/drivers/imx/interrupt-generic.c
index 8b07b9b46540..1b5bd0c7c537 100644
--- a/src/drivers/imx/interrupt-generic.c
+++ b/src/drivers/imx/interrupt-generic.c
@@ -20,9 +20,7 @@
 
 LOG_MODULE_REGISTER(generic_irq_imx, CONFIG_SOF_LOG_LEVEL);
 
-/* fa00558c-d653-4851-a03a-b21f125a9524 */
-SOF_DEFINE_UUID("interrupt", interrupt_uuid, 0xfa00558c, 0xd653, 0x4851,
-		 0xa0, 0x3a, 0xb2, 0x1f, 0x12, 0x5a, 0x95, 0x24);
+SOF_DEFINE_REG_UUID(interrupt);
 
 DECLARE_TR_CTX(noirq_i_tr, SOF_UUID(interrupt_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/imx/interrupt-irqsteer.c b/src/drivers/imx/interrupt-irqsteer.c
index faf1a851ab18..da45b4f109ba 100644
--- a/src/drivers/imx/interrupt-irqsteer.c
+++ b/src/drivers/imx/interrupt-irqsteer.c
@@ -21,9 +21,7 @@
 
 LOG_MODULE_REGISTER(irq_imx, CONFIG_SOF_LOG_LEVEL);
 
-/* fa00558c-d653-4851-a03a-b21f125a9524 */
-SOF_DEFINE_UUID("interrupt", interrupt_uuid, 0xfa00558c, 0xd653, 0x4851,
-		 0xa0, 0x3a, 0xb2, 0x1f, 0x12, 0x5a, 0x95, 0x24);
+SOF_DEFINE_REG_UUID(interrupt);
 
 DECLARE_TR_CTX(irq_i_tr, SOF_UUID(interrupt_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/imx/ipc.c b/src/drivers/imx/ipc.c
index 95708ffa9cd0..0ff4f93fb890 100644
--- a/src/drivers/imx/ipc.c
+++ b/src/drivers/imx/ipc.c
@@ -43,9 +43,7 @@ LOG_MODULE_REGISTER(ipc_task, CONFIG_SOF_LOG_LEVEL);
 #define interrupt_clear(irq)
 #endif /* CONFIG_IMX8M */
 
-/* 389c9186-5a7d-4ad1-a02c-a02ecdadfb33 */
-SOF_DEFINE_UUID("ipc_task", ipc_task_uuid, 0x389c9186, 0x5a7d, 0x4ad1,
-		 0xa0, 0x2c, 0xa0, 0x2e, 0xcd, 0xad, 0xfb, 0x33);
+SOF_DEFINE_REG_UUID(ipc_task);
 
 struct ipc_data {
 	struct ipc_data_host_buffer dh_buffer;
diff --git a/src/drivers/imx/micfil.c b/src/drivers/imx/micfil.c
index 149b72631720..c6e366198a5f 100644
--- a/src/drivers/imx/micfil.c
+++ b/src/drivers/imx/micfil.c
@@ -20,9 +20,7 @@
 
 LOG_MODULE_REGISTER(micfil_dai, CONFIG_SOF_LOG_LEVEL);
 
-/* dd400475-35d7-4045-ab03-0c34957d7a08 */
-SOF_DEFINE_UUID("micfil", micfil_uuid, 0xdd400475, 0x35d7, 0x4045,
-		 0xab, 0x03, 0x0c, 0x34, 0x95, 0x7d, 0x7a, 0x08);
+SOF_DEFINE_REG_UUID(micfil);
 
 DECLARE_TR_CTX(micfil_tr, SOF_UUID(micfil_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/imx/sai.c b/src/drivers/imx/sai.c
index 98258d0fd66b..7a6e529f1b0a 100644
--- a/src/drivers/imx/sai.c
+++ b/src/drivers/imx/sai.c
@@ -20,9 +20,7 @@
 
 LOG_MODULE_REGISTER(sai, CONFIG_SOF_LOG_LEVEL);
 
-/* 9302adf5-88be-4234-a0a7-dca538ef81f4 */
-SOF_DEFINE_UUID("sai", sai_uuid, 0x9302adf5, 0x88be, 0x4234,
-		 0xa0, 0xa7, 0xdc, 0xa5, 0x38, 0xef, 0x81, 0xf4);
+SOF_DEFINE_REG_UUID(sai);
 
 DECLARE_TR_CTX(sai_tr, SOF_UUID(sai_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/imx/sdma.c b/src/drivers/imx/sdma.c
index 29f096d487dd..92a1e2d66d5e 100644
--- a/src/drivers/imx/sdma.c
+++ b/src/drivers/imx/sdma.c
@@ -20,9 +20,7 @@
 
 LOG_MODULE_REGISTER(sdma, CONFIG_SOF_LOG_LEVEL);
 
-/* 70d223ef-2b91-4aac-b444-d89a0db2793a */
-SOF_DEFINE_UUID("sdma", sdma_uuid, 0x70d223ef, 0x2b91, 0x4aac,
-		 0xb4, 0x44, 0xd8, 0x9a, 0x0d, 0xb2, 0x79, 0x3a);
+SOF_DEFINE_REG_UUID(sdma);
 
 DECLARE_TR_CTX(sdma_tr, SOF_UUID(sdma_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/interrupt.c b/src/drivers/interrupt.c
index a5cf5862df47..2829b4c0a16a 100644
--- a/src/drivers/interrupt.c
+++ b/src/drivers/interrupt.c
@@ -24,8 +24,7 @@ LOG_MODULE_REGISTER(irq, CONFIG_SOF_LOG_LEVEL);
 
 /* 1862d39a-3a84-4d64-8c91-dce1dfc122db */
 
-SOF_DEFINE_UUID("irq", irq_uuid, 0x1862d39a, 0x3a84, 0x4d64,
-		 0x8c, 0x91, 0xdc, 0xe1, 0xdf, 0xc1, 0x22, 0xdb);
+SOF_DEFINE_REG_UUID(irq);
 
 DECLARE_TR_CTX(irq_tr, SOF_UUID(irq_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/mediatek/afe/afe-dai.c b/src/drivers/mediatek/afe/afe-dai.c
index 82167d4316c4..ee6b9cff0d8e 100644
--- a/src/drivers/mediatek/afe/afe-dai.c
+++ b/src/drivers/mediatek/afe/afe-dai.c
@@ -24,9 +24,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-/* 30290c76-6a05-4784-8464-c21f09cee87e */
-SOF_DEFINE_UUID("afe_dai", afe_dai_uuid, 0x30290c76, 0x6a05, 0x4784,
-		 0x84, 0x64, 0xc2, 0x1f, 0x09, 0xce, 0xe8, 0x7e);
+SOF_DEFINE_REG_UUID(afe_dai);
 
 DECLARE_TR_CTX(afe_dai_tr, SOF_UUID(afe_dai_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/mediatek/afe/afe-drv.c b/src/drivers/mediatek/afe/afe-drv.c
index 60d46e3444a4..5681638344a6 100644
--- a/src/drivers/mediatek/afe/afe-drv.c
+++ b/src/drivers/mediatek/afe/afe-drv.c
@@ -26,8 +26,7 @@ static struct mtk_base_afe mtk_afe;
 #define printf(format, ...)
 #endif
 
-SOF_DEFINE_UUID("afedrv", afedrv_uuid, 0x4e8f16d1, 0xe935, 0x41f4,
-		 0xb9, 0x9e, 0x42, 0xc5, 0x7e, 0x74, 0x57, 0x84);
+SOF_DEFINE_REG_UUID(afedrv);
 
 DECLARE_TR_CTX(afedrv_tr, SOF_UUID(afedrv_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/mediatek/afe/afe-memif.c b/src/drivers/mediatek/afe/afe-memif.c
index 3f71fe9fea37..3a9abf73f016 100644
--- a/src/drivers/mediatek/afe/afe-memif.c
+++ b/src/drivers/mediatek/afe/afe-memif.c
@@ -26,9 +26,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-/* df5e94d7-fd93-42e9-bb94-ab40becc7151 */
-SOF_DEFINE_UUID("memif", memif_uuid, 0xdf5e94d7, 0xfd93, 0x42e9,
-		 0xbb, 0x94, 0xab, 0x40, 0xbe, 0xcc, 0x71, 0x51);
+SOF_DEFINE_REG_UUID(memif);
 
 DECLARE_TR_CTX(memif_tr, SOF_UUID(memif_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/mediatek/afe/mt8186/afe-sgen.c b/src/drivers/mediatek/afe/mt8186/afe-sgen.c
index 538331beb6c9..145db9ab81db 100644
--- a/src/drivers/mediatek/afe/mt8186/afe-sgen.c
+++ b/src/drivers/mediatek/afe/mt8186/afe-sgen.c
@@ -14,9 +14,7 @@
 #include <mt8186-afe-regs.h>
 #include <mt8186-afe-common.h>
 
-/* cf90d851-68a2-4987-a2de-85aed0c8531c */
-SOF_DEFINE_UUID("sgen_mt8186", sgen_mt8186_uuid, 0xcf90d851, 0x68a2, 0x4987,
-		 0xa2, 0xde, 0x85, 0xae, 0xd0, 0xc8, 0x53, 0x1c);
+SOF_DEFINE_REG_UUID(sgen_mt8186);
 
 DECLARE_TR_CTX(sgen_tr, SOF_UUID(sgen_mt8186_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/mediatek/afe/mt8188/afe-sgen.c b/src/drivers/mediatek/afe/mt8188/afe-sgen.c
index 8d8656157d67..97223816bef9 100644
--- a/src/drivers/mediatek/afe/mt8188/afe-sgen.c
+++ b/src/drivers/mediatek/afe/mt8188/afe-sgen.c
@@ -15,9 +15,7 @@
 #include <mt8188-afe-reg.h>
 #include <mt8188-afe-common.h>
 
-/* 99316bd9-07b9-4665-8179-6e048d67cb45 */
-SOF_DEFINE_UUID("sgen_mt8188", sgen_mt8188_uuid, 0x99316bd9, 0x07b9, 0x4665,
-		 0x81, 0x79, 0x6e, 0x04, 0x8d, 0x67, 0xcb, 0x45);
+SOF_DEFINE_REG_UUID(sgen_mt8188);
 
 DECLARE_TR_CTX(sgen_tr, SOF_UUID(sgen_mt8188_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/mediatek/afe/mt8195/afe-sgen.c b/src/drivers/mediatek/afe/mt8195/afe-sgen.c
index 595a022d2b23..58478ac3aa9e 100644
--- a/src/drivers/mediatek/afe/mt8195/afe-sgen.c
+++ b/src/drivers/mediatek/afe/mt8195/afe-sgen.c
@@ -15,9 +15,7 @@
 #include <mt8195-afe-regs.h>
 #include <mt8195-afe-common.h>
 
-/* 9eb1a55b-fc20-4442-9613-1ff1023be493 */
-SOF_DEFINE_UUID("sgen_mt8195", sgen_mt8195_uuid, 0x9eb1a55b, 0xfc20, 0x4442,
-		 0x96, 0x13, 0x1f, 0xf1, 0x02, 0x3b, 0xe4, 0x93);
+SOF_DEFINE_REG_UUID(sgen_mt8195);
 
 DECLARE_TR_CTX(sgen_tr, SOF_UUID(sgen_mt8195_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/mediatek/mt818x/interrupt.c b/src/drivers/mediatek/mt818x/interrupt.c
index f59ffdc760ee..cf48a3ea4eb9 100644
--- a/src/drivers/mediatek/mt818x/interrupt.c
+++ b/src/drivers/mediatek/mt818x/interrupt.c
@@ -23,9 +23,7 @@
 
 #define PENDING_IRQ_INDEX_MAX 32
 
-/* d2e3f730-df39-42ee-81a8-39bfb4d024c2 */
-SOF_DEFINE_UUID("irq_mt818x", irq_mt818x_uuid, 0xd2e3f730, 0xdf39, 0x42ee,
-		 0x81, 0xa8, 0x39, 0xbf, 0xb4, 0xd0, 0x24, 0xc2);
+SOF_DEFINE_REG_UUID(irq_mt818x);
 
 DECLARE_TR_CTX(int_tr, SOF_UUID(irq_mt818x_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/mediatek/mt818x/ipc.c b/src/drivers/mediatek/mt818x/ipc.c
index bff36de85d15..20fc54c20f4a 100644
--- a/src/drivers/mediatek/mt818x/ipc.c
+++ b/src/drivers/mediatek/mt818x/ipc.c
@@ -35,9 +35,7 @@
 #define IPC_DSPMBOX_DSP_RSP 0
 #define IPC_DSPMBOX_DSP_REQ 1
 
-/* a3fe3bf2-39a4-4fc3-b341-8a96e0a26759 */
-SOF_DEFINE_UUID("ipc_task_mt818x", ipc_task_mt818x_uuid, 0xa3fe3bf2, 0x39a4, 0x4fc3,
-		 0xb3, 0x41, 0x8a, 0x96, 0xe0, 0xa2, 0x67, 0x59);
+SOF_DEFINE_REG_UUID(ipc_task_mt818x);
 
 static struct ipc *local_ipc;
 
diff --git a/src/drivers/mediatek/mt8195/interrupt.c b/src/drivers/mediatek/mt8195/interrupt.c
index 54c21a3ea3c7..3aaf883600fd 100644
--- a/src/drivers/mediatek/mt8195/interrupt.c
+++ b/src/drivers/mediatek/mt8195/interrupt.c
@@ -20,9 +20,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-/* fa00558c-d653-4851-a03a-b21f125a9524 */
-SOF_DEFINE_UUID("interrupt", interrupt_uuid, 0xfa00558c, 0xd653, 0x4851,
-		 0xa0, 0x3a, 0xb2, 0x1f, 0x12, 0x5a, 0x95, 0x24);
+SOF_DEFINE_REG_UUID(interrupt);
 
 DECLARE_TR_CTX(int_tr, SOF_UUID(interrupt_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/drivers/mediatek/mt8195/ipc.c b/src/drivers/mediatek/mt8195/ipc.c
index 1ba13a4e412d..a5766d68f385 100644
--- a/src/drivers/mediatek/mt8195/ipc.c
+++ b/src/drivers/mediatek/mt8195/ipc.c
@@ -34,9 +34,7 @@
 #define IPC_DSPMBOX_DSP_RSP 0
 #define IPC_DSPMBOX_DSP_REQ 1
 
-/* 389c9186-5a7d-4ad1-a02c-a02ecdadfb33 */
-SOF_DEFINE_UUID("ipc_task", ipc_task_uuid, 0x389c9186, 0x5a7d, 0x4ad1,
-		 0xa0, 0x2c, 0xa0, 0x2e, 0xcd, 0xad, 0xfb, 0x33);
+SOF_DEFINE_REG_UUID(ipc_task);
 
 static struct ipc *local_ipc;
 
diff --git a/src/idc/idc.c b/src/idc/idc.c
index 70ce13f5df85..69c7ad1f84bd 100644
--- a/src/idc/idc.c
+++ b/src/idc/idc.c
@@ -39,20 +39,14 @@ LOG_MODULE_REGISTER(idc, CONFIG_SOF_LOG_LEVEL);
 /** \brief IDC message payload per core. */
 static SHARED_DATA struct idc_payload static_payload[CONFIG_CORE_COUNT];
 
-/* 379a60ae-cedb-4777-aaf2-5659b0a85735 */
-SOF_DEFINE_UUID("idc", idc_uuid, 0x379a60ae, 0xcedb, 0x4777,
-		 0xaa, 0xf2, 0x56, 0x59, 0xb0, 0xa8, 0x57, 0x35);
+SOF_DEFINE_REG_UUID(idc);
 
 DECLARE_TR_CTX(idc_tr, SOF_UUID(idc_uuid), LOG_LEVEL_INFO);
 
-/* b90f5a4e-5537-4375-a1df-95485472ff9e */
-SOF_DEFINE_UUID("idc_task", idc_task_uuid, 0xb90f5a4e, 0x5537, 0x4375,
-		 0xa1, 0xdf, 0x95, 0x48, 0x54, 0x72, 0xff, 0x9e);
+SOF_DEFINE_REG_UUID(idc_task);
 
 #ifndef __ZEPHYR__
-/* a5dacb0e-88dc-415c-a1b5-3e8df77f1976 */
-SOF_DEFINE_UUID("idc_cmd_task", idc_cmd_task_uuid, 0xa5dacb0e, 0x88dc, 0x415c,
-		 0xa1, 0xb5, 0x3e, 0x8d, 0xf7, 0x7f, 0x19, 0x76);
+SOF_DEFINE_REG_UUID(idc_cmd_task);
 #endif
 
 /**
diff --git a/src/idc/zephyr_idc.c b/src/idc/zephyr_idc.c
index 1aca5561d557..74a0da0f5bab 100644
--- a/src/idc/zephyr_idc.c
+++ b/src/idc/zephyr_idc.c
@@ -35,9 +35,7 @@
 
 LOG_MODULE_REGISTER(zephyr_idc, CONFIG_SOF_LOG_LEVEL);
 
-/* 5f1ec3f8-faaf-4099-903c-cee98351f169 */
-SOF_DEFINE_UUID("zephyr_idc", zephyr_idc_uuid, 0x5f1ec3f8, 0xfaaf, 0x4099,
-		 0x90, 0x3c, 0xce, 0xe9, 0x83, 0x51, 0xf1, 0x69);
+SOF_DEFINE_REG_UUID(zephyr_idc);
 
 DECLARE_TR_CTX(zephyr_idc_tr, SOF_UUID(zephyr_idc_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/ipc/dma-copy.c b/src/ipc/dma-copy.c
index 1acc33cedc93..95cc51c41fd7 100644
--- a/src/ipc/dma-copy.c
+++ b/src/ipc/dma-copy.c
@@ -20,9 +20,7 @@
 /* tracing */
 LOG_MODULE_REGISTER(dma_copy, CONFIG_SOF_LOG_LEVEL);
 
-/* 729bf8b5-e873-4bf5-9690-8e2a3fd33911 */
-SOF_DEFINE_UUID("dma_copy", dma_copy_uuid, 0x729bf8b5, 0xe873, 0x4bf5,
-		 0x96, 0x90, 0x8e, 0x2a, 0x3f, 0xd3, 0x39, 0x11);
+SOF_DEFINE_REG_UUID(dma_copy);
 
 DECLARE_TR_CTX(dmacpy_tr, SOF_UUID(dma_copy_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/ipc/ipc-common.c b/src/ipc/ipc-common.c
index 551130df79b6..0bb57b277ae6 100644
--- a/src/ipc/ipc-common.c
+++ b/src/ipc/ipc-common.c
@@ -34,9 +34,7 @@
 
 LOG_MODULE_REGISTER(ipc, CONFIG_SOF_LOG_LEVEL);
 
-/* be60f97d-78df-4796-a0ee-435cb56b720a */
-SOF_DEFINE_UUID("ipc", ipc_uuid, 0xbe60f97d, 0x78df, 0x4796,
-		 0xa0, 0xee, 0x43, 0x5c, 0xb5, 0x6b, 0x72, 0x0a);
+SOF_DEFINE_REG_UUID(ipc);
 
 DECLARE_TR_CTX(ipc_tr, SOF_UUID(ipc_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/ipc/ipc-zephyr.c b/src/ipc/ipc-zephyr.c
index 3779b6998381..a410e03123d6 100644
--- a/src/ipc/ipc-zephyr.c
+++ b/src/ipc/ipc-zephyr.c
@@ -42,9 +42,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-/* 8fa1d42f-bc6f-464b-867f-547af08834da */
-SOF_DEFINE_UUID("zipc_task", zipc_task_uuid, 0x8fa1d42f, 0xbc6f, 0x464b,
-		 0x86, 0x7f, 0x54, 0x7a, 0xf0, 0x88, 0x34, 0xda);
+SOF_DEFINE_REG_UUID(zipc_task);
 
 LOG_MODULE_DECLARE(ipc, CONFIG_SOF_LOG_LEVEL);
 
diff --git a/src/ipc/ipc4/logging.c b/src/ipc/ipc4/logging.c
index 9c37c063c9c2..29ba657d17c7 100644
--- a/src/ipc/ipc4/logging.c
+++ b/src/ipc/ipc4/logging.c
@@ -51,9 +51,7 @@ LOG_MODULE_REGISTER(mtrace, CONFIG_SOF_LOG_LEVEL);
  */
 #define IPC4_MTRACE_AGING_TIMER_MIN_MS 100
 
-/* bb2aa22e-1ab6-4650-8501-6e67fcc04f4e */
-SOF_DEFINE_UUID("mtrace_task", mtrace_task_uuid, 0xbb2aa22e, 0x1ab6, 0x4650,
-		 0x85, 0x01, 0x6e, 0x67, 0xfc, 0xc0, 0x4f, 0x4e);
+SOF_DEFINE_REG_UUID(mtrace_task);
 
 static uint64_t mtrace_notify_last_sent;
 
diff --git a/src/lib/agent.c b/src/lib/agent.c
index 2365b86fef72..8edc6ccb3123 100644
--- a/src/lib/agent.c
+++ b/src/lib/agent.c
@@ -37,15 +37,11 @@
 
 LOG_MODULE_REGISTER(sa, CONFIG_SOF_LOG_LEVEL);
 
-/* 5276b491-5b64-464e-8984-dc228ef9e6a1 */
-SOF_DEFINE_UUID("sa", sa_uuid, 0x5276b491, 0x5b64, 0x464e,
-		 0x89, 0x84, 0xdc, 0x22, 0x8e, 0xf9, 0xe6, 0xa1);
+SOF_DEFINE_REG_UUID(sa);
 
 DECLARE_TR_CTX(sa_tr, SOF_UUID(sa_uuid), LOG_LEVEL_INFO);
 
-/* c63c4e75-8f61-4420-9319-1395932efa9e */
-SOF_DEFINE_UUID("agent_work", agent_work_uuid, 0xc63c4e75, 0x8f61, 0x4420,
-		 0x93, 0x19, 0x13, 0x95, 0x93, 0x2e, 0xfa, 0x9e);
+SOF_DEFINE_REG_UUID(agent_work);
 
 #if CONFIG_PERFORMANCE_COUNTERS
 static void perf_sa_trace(struct perf_cnt_data *pcd, int ignored)
diff --git a/src/lib/alloc.c b/src/lib/alloc.c
index 8e6ebd51505f..bbd335d872e5 100644
--- a/src/lib/alloc.c
+++ b/src/lib/alloc.c
@@ -26,9 +26,7 @@
 
 LOG_MODULE_REGISTER(memory, CONFIG_SOF_LOG_LEVEL);
 
-/* 425d6e68-145c-4455-b0b2-c7260b0600a5 */
-SOF_DEFINE_UUID("mem", mem_uuid, 0x425d6e68, 0x145c, 0x4455,
-		 0xb0, 0xb2, 0xc7, 0x26, 0x0b, 0x06, 0x00, 0xa5);
+SOF_DEFINE_REG_UUID(mem);
 
 DECLARE_TR_CTX(mem_tr, SOF_UUID(mem_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/lib/ams.c b/src/lib/ams.c
index 06b64ac692ac..9d2dc2d7a102 100644
--- a/src/lib/ams.c
+++ b/src/lib/ams.c
@@ -26,8 +26,7 @@
 
 LOG_MODULE_REGISTER(ams, CONFIG_SOF_LOG_LEVEL);
 
-SOF_DEFINE_UUID("ams", ams_uuid, 0xea9c4bca, 0x5b7d, 0x48c6,
-		 0x95, 0x86, 0x55, 0x3e, 0x27, 0x23, 0x5b, 0xeb);
+SOF_DEFINE_REG_UUID(ams);
 
 DECLARE_TR_CTX(ams_tr, SOF_UUID(ams_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/lib/clk.c b/src/lib/clk.c
index e8c8281d6269..1c533fb91fa2 100644
--- a/src/lib/clk.c
+++ b/src/lib/clk.c
@@ -20,9 +20,7 @@
 
 LOG_MODULE_REGISTER(clock, CONFIG_SOF_LOG_LEVEL);
 
-/* 8890ea76-0df9-44ae-87e6-994f4c15e9fa */
-SOF_DEFINE_UUID("clock", clock_uuid, 0x8890ea76, 0x0df9, 0x44ae,
-		 0x87, 0xe6, 0x99, 0x4f, 0x4c, 0x15, 0xe9, 0xfa);
+SOF_DEFINE_REG_UUID(clock);
 
 DECLARE_TR_CTX(clock_tr, SOF_UUID(clock_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/lib/dai.c b/src/lib/dai.c
index f0fe1ce1a344..772dd0eb66e5 100644
--- a/src/lib/dai.c
+++ b/src/lib/dai.c
@@ -24,9 +24,7 @@
 #endif
 LOG_MODULE_REGISTER(dai, CONFIG_SOF_LOG_LEVEL);
 
-/* 06711c94-d37d-4a76-b302-bbf6944fdd2b */
-SOF_DEFINE_UUID("dai_lib", dai_lib_uuid, 0x06711c94, 0xd37d, 0x4a76,
-		 0xb3, 0x02, 0xbb, 0xf6, 0x94, 0x4f, 0xdd, 0x2b);
+SOF_DEFINE_REG_UUID(dai_lib);
 
 DECLARE_TR_CTX(dai_tr, SOF_UUID(dai_lib_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/lib/dma.c b/src/lib/dma.c
index 588db331c928..185e9b72694c 100644
--- a/src/lib/dma.c
+++ b/src/lib/dma.c
@@ -22,9 +22,7 @@
 
 LOG_MODULE_REGISTER(dma, CONFIG_SOF_LOG_LEVEL);
 
-/* bc3526a7-9b86-4ab4-84a5-2e02ae70cc10 */
-SOF_DEFINE_UUID("dma", dma_uuid, 0xbc3526a7, 0x9b86, 0x4ab4,
-		 0x84, 0xa5, 0x2e, 0x02, 0xae, 0x70, 0xcc, 0x10);
+SOF_DEFINE_REG_UUID(dma);
 
 DECLARE_TR_CTX(dma_tr, SOF_UUID(dma_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/lib/notifier.c b/src/lib/notifier.c
index ef467a0ff529..98fbad4346fc 100644
--- a/src/lib/notifier.c
+++ b/src/lib/notifier.c
@@ -21,9 +21,7 @@
 
 LOG_MODULE_REGISTER(notifier, CONFIG_SOF_LOG_LEVEL);
 
-/* 1fb15a7a-83cd-4c2e-8b32-4da1b2adeeaf */
-SOF_DEFINE_UUID("notifier", notifier_uuid, 0x1fb15a7a, 0x83cd, 0x4c2e,
-		 0x8b, 0x32, 0x4d, 0xa1, 0xb2, 0xad, 0xee, 0xaf);
+SOF_DEFINE_REG_UUID(notifier);
 
 DECLARE_TR_CTX(nt_tr, SOF_UUID(notifier_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/lib/pm_runtime.c b/src/lib/pm_runtime.c
index 44a636033f0f..1c2e54fe2da2 100644
--- a/src/lib/pm_runtime.c
+++ b/src/lib/pm_runtime.c
@@ -26,9 +26,7 @@
 
 LOG_MODULE_REGISTER(pm_runtime, CONFIG_SOF_LOG_LEVEL);
 
-/* d7f6712d-131c-45a7-82ed-6aa9dc2291ea */
-SOF_DEFINE_UUID("pm_runtime", pm_runtime_uuid, 0xd7f6712d, 0x131c, 0x45a7,
-		 0x82, 0xed, 0x6a, 0xa9, 0xdc, 0x22, 0x91, 0xea);
+SOF_DEFINE_REG_UUID(pm_runtime);
 
 DECLARE_TR_CTX(pm_tr, SOF_UUID(pm_runtime_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/lib/wait.c b/src/lib/wait.c
index cd6b3b38e428..14c21d621209 100644
--- a/src/lib/wait.c
+++ b/src/lib/wait.c
@@ -22,9 +22,7 @@
 
 LOG_MODULE_REGISTER(wait, CONFIG_SOF_LOG_LEVEL);
 
-/* 1028070e-04e8-46ab-8d81-10a0116ce738 */
-SOF_DEFINE_UUID("wait", wait_uuid, 0x1028070e, 0x04e8, 0x46ab,
-		 0x8d, 0x81, 0x10, 0xa0, 0x11, 0x6c, 0xe7, 0x38);
+SOF_DEFINE_REG_UUID(wait);
 
 DECLARE_TR_CTX(wait_tr, SOF_UUID(wait_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/library_manager/lib_manager.c b/src/library_manager/lib_manager.c
index 7b6392c07c43..82e9625a6a38 100644
--- a/src/library_manager/lib_manager.c
+++ b/src/library_manager/lib_manager.c
@@ -45,8 +45,7 @@
 LOG_MODULE_REGISTER(lib_manager, CONFIG_SOF_LOG_LEVEL);
 /* 54cf5598-8b29-11ec-a8a3-0242ac120002 */
 
-SOF_DEFINE_UUID("lib_manager", lib_manager_uuid, 0x54cf5598, 0x8b29, 0x11ec,
-		 0xa8, 0xa3, 0x02, 0x42, 0xac, 0x12, 0x00, 0x02);
+SOF_DEFINE_REG_UUID(lib_manager);
 
 DECLARE_TR_CTX(lib_manager_tr, SOF_UUID(lib_manager_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/math/power.c b/src/math/power.c
index c583ece6cdcf..ba8071373721 100644
--- a/src/math/power.c
+++ b/src/math/power.c
@@ -15,9 +15,7 @@
 #include <user/trace.h>
 #include <stdint.h>
 
-/* d23cf8d0-8dfe-497c-8202-5f909cf72735 */
-SOF_DEFINE_UUID("math_power", math_power_uuid, 0xd23cf8d0, 0x8dfe, 0x497c,
-		 0x82, 0x02, 0x5f, 0x90, 0x9c, 0xf7, 0x27, 0x35);
+SOF_DEFINE_REG_UUID(math_power);
 
 DECLARE_TR_CTX(math_power_tr, SOF_UUID(math_power_uuid), LOG_LEVEL_INFO);
 /* define constant */
diff --git a/src/platform/amd/acp_6_3/lib/clk.c b/src/platform/amd/acp_6_3/lib/clk.c
index 2fd01b012948..5a735d4241fa 100644
--- a/src/platform/amd/acp_6_3/lib/clk.c
+++ b/src/platform/amd/acp_6_3/lib/clk.c
@@ -40,9 +40,7 @@
 #include <platform/fw_scratch_mem.h>
 #include <platform/chip_registers.h>
 
-/* f8a7091c-7d2d-4410-9bb5-55278378d59f */
-SOF_DEFINE_UUID("acp_clk", acp_clk_uuid, 0xf8a7091c, 0x7d2d, 0x4410,
-		0x9b, 0xb5, 0x55, 0x27, 0x83, 0x78, 0xd5, 0x9f);
+SOF_DEFINE_REG_UUID(acp_clk);
 
 DECLARE_TR_CTX(acp_clk_tr, SOF_UUID(acp_clk_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/platform/intel/ace/lib/watchdog.c b/src/platform/intel/ace/lib/watchdog.c
index 53012c25ad13..dcae80da801d 100644
--- a/src/platform/intel/ace/lib/watchdog.c
+++ b/src/platform/intel/ace/lib/watchdog.c
@@ -21,9 +21,7 @@
 
 LOG_MODULE_REGISTER(wdt, CONFIG_SOF_LOG_LEVEL);
 
-/* 13c8bc59-c4fa-4ad1-b93a-ce97cd30acc7 */
-SOF_DEFINE_UUID("wdt", wdt_uuid, 0x13c8bc59, 0xc4fa, 0x4ad1,
-		 0xb9, 0x3a, 0xce, 0x97, 0xcd, 0x30, 0xac, 0xc7);
+SOF_DEFINE_REG_UUID(wdt);
 
 DECLARE_TR_CTX(wdt_tr, SOF_UUID(wdt_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/platform/library/schedule/edf_schedule.c b/src/platform/library/schedule/edf_schedule.c
index 62356426606e..0c127c934e21 100644
--- a/src/platform/library/schedule/edf_schedule.c
+++ b/src/platform/library/schedule/edf_schedule.c
@@ -13,9 +13,7 @@
 
  /* scheduler testbench definition */
 
-/* 5dbc3672-e290-43d8-91f8-81aafe453d5b */
-SOF_DEFINE_UUID("edf_sched_lib", edf_sched_lib_uuid, 0x5dbc3672, 0xe290, 0x43d8,
-		0x91, 0xf8, 0x81, 0xaa, 0xfe, 0x45, 0x3d, 0x5b);
+SOF_DEFINE_REG_UUID(edf_sched_lib);
 
 DECLARE_TR_CTX(edf_tr, SOF_UUID(edf_sched_lib_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/platform/library/schedule/ll_schedule.c b/src/platform/library/schedule/ll_schedule.c
index c5dd1efaab70..4cfd0a9d196c 100644
--- a/src/platform/library/schedule/ll_schedule.c
+++ b/src/platform/library/schedule/ll_schedule.c
@@ -20,9 +20,7 @@
 
  /* scheduler testbench definition */
 
-/* 9f130ed8-2bbf-421c-836a-d5269147c9e7 */
-SOF_DEFINE_UUID("ll_sched_lib", ll_sched_lib_uuid, 0x9f130ed8, 0x2bbf, 0x421c,
-		0x83, 0x6a, 0xd5, 0x26, 0x91, 0x47, 0xc9, 0xe7);
+SOF_DEFINE_REG_UUID(ll_sched_lib);
 
 DECLARE_TR_CTX(ll_tr, SOF_UUID(ll_sched_lib_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/platform/mt8186/lib/clk.c b/src/platform/mt8186/lib/clk.c
index 898d03a2e94d..555ab83c2a4f 100644
--- a/src/platform/mt8186/lib/clk.c
+++ b/src/platform/mt8186/lib/clk.c
@@ -18,9 +18,7 @@
 #include <rtos/sof.h>
 #include <sof/trace/trace.h>
 
-/* 53863428-9a72-44df-af0f-fe45ea2348ba */
-SOF_DEFINE_UUID("clkdrv_mt8186", clkdrv_mt8186_uuid, 0x53863428, 0x9a72, 0x44df,
-		 0xaf, 0x0f, 0xfe, 0x45, 0xea, 0x23, 0x48, 0xba);
+SOF_DEFINE_REG_UUID(clkdrv_mt8186);
 
 DECLARE_TR_CTX(clkdrv_tr, SOF_UUID(clkdrv_mt8186_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/platform/mt8188/lib/clk.c b/src/platform/mt8188/lib/clk.c
index 677e55f309cc..d11b9fe2317b 100644
--- a/src/platform/mt8188/lib/clk.c
+++ b/src/platform/mt8188/lib/clk.c
@@ -18,9 +18,7 @@
 #include <rtos/sof.h>
 #include <sof/trace/trace.h>
 
-/* 19d4e680-4479-48cc-af86-9f63d8b0098b */
-SOF_DEFINE_UUID("clkdrv_mt8188", clkdrv_mt8188_uuid, 0x19d4e680, 0x4479, 0x48cc,
-		 0xaf, 0x86, 0x9f, 0x63, 0xd8, 0xb0, 0x09, 0x8b);
+SOF_DEFINE_REG_UUID(clkdrv_mt8188);
 
 DECLARE_TR_CTX(clkdrv_tr, SOF_UUID(clkdrv_mt8188_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/platform/mt8195/lib/clk.c b/src/platform/mt8195/lib/clk.c
index 5d139a9aac0e..3f69c5e2d8f1 100644
--- a/src/platform/mt8195/lib/clk.c
+++ b/src/platform/mt8195/lib/clk.c
@@ -14,8 +14,7 @@
 #include <rtos/wait.h>
 #include <rtos/sof.h>
 
-SOF_DEFINE_UUID("clkdrv_mt8195", clkdrv_mt8195_uuid, 0x23b12fd5, 0xc2a9, 0x41a8,
-		 0xa2, 0xb3, 0x23, 0x1a, 0xb7, 0xdc, 0xdc, 0x70);
+SOF_DEFINE_REG_UUID(clkdrv_mt8195);
 
 DECLARE_TR_CTX(clkdrv_tr, SOF_UUID(clkdrv_mt8195_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/platform/posix/ipc.c b/src/platform/posix/ipc.c
index 29848d3f160b..e3ee35999abc 100644
--- a/src/platform/posix/ipc.c
+++ b/src/platform/posix/ipc.c
@@ -10,9 +10,7 @@
 #include <sof/audio/component_ext.h>
 
 // 6c8f0d53-ff77-4ca1-b825-c0c4e1b0d322
-SOF_DEFINE_UUID("ipc_task_posix", ipc_task_posix_uuid,
-		 0x6c8f0d53, 0xff77, 0x4ca1,
-		 0xb8, 0x25, 0xc0, 0xc4, 0xe1, 0xb0, 0xd3, 0x22);
+SOF_DEFINE_REG_UUID(ipc_task_posix);
 
 static struct ipc *global_ipc;
 
diff --git a/src/probe/probe.c b/src/probe/probe.c
index 21eb3a1a4e98..721004555636 100644
--- a/src/probe/probe.c
+++ b/src/probe/probe.c
@@ -29,16 +29,12 @@
 #include <sof/audio/component_ext.h>
 #include <sof/ut.h>
 
-/* 7CAD0808-AB10-CD23-EF45-12AB34CD56EF */
-SOF_DEFINE_UUID("probe4", probe4_uuid, 0x7CAD0808, 0xAB10, 0xCD23,
-		    0xEF, 0x45, 0x12, 0xAB, 0x34, 0xCD, 0x56, 0xEF);
+SOF_DEFINE_REG_UUID(probe4);
 #define PROBE_UUID probe4_uuid
 
 static const struct comp_driver comp_probe;
 #elif CONFIG_IPC_MAJOR_3
-/* 9d1fb66e-4ffb-497f-994b-17719686596e */
-SOF_DEFINE_UUID("probe", probe_uuid, 0x9d1fb66e, 0x4ffb, 0x497f,
-		    0x99, 0x4b, 0x17, 0x71, 0x96, 0x86, 0x59, 0x6e);
+SOF_DEFINE_REG_UUID(probe);
 #define PROBE_UUID probe_uuid
 
 #else
@@ -47,9 +43,7 @@ SOF_DEFINE_UUID("probe", probe_uuid, 0x9d1fb66e, 0x4ffb, 0x497f,
 
 DECLARE_TR_CTX(pr_tr, SOF_UUID(PROBE_UUID), LOG_LEVEL_INFO);
 
-/* 2f0b1901-cac0-4b87-812f-f2d5e4f19e4a */
-SOF_DEFINE_UUID("probe_task", probe_task_uuid, 0x2f0b1901, 0xcac0, 0x4b87,
-		 0x81, 0x2f, 0xf2, 0xd5, 0xe4, 0xf1, 0x9e, 0x4a);
+SOF_DEFINE_REG_UUID(probe_task);
 
 LOG_MODULE_REGISTER(probe, CONFIG_SOF_LOG_LEVEL);
 
diff --git a/src/samples/audio/detect_test.c b/src/samples/audio/detect_test.c
index 237cb47b6e6c..2dab16c08667 100644
--- a/src/samples/audio/detect_test.c
+++ b/src/samples/audio/detect_test.c
@@ -69,9 +69,7 @@ static const struct comp_driver comp_keyword;
 
 LOG_MODULE_REGISTER(kd_test, CONFIG_SOF_LOG_LEVEL);
 
-/* eba8d51f-7827-47b5-82ee-de6e7743af67 */
-SOF_DEFINE_UUID("keyword", keyword_uuid, 0xeba8d51f, 0x7827, 0x47b5,
-		 0x82, 0xee, 0xde, 0x6e, 0x77, 0x43, 0xaf, 0x67);
+SOF_DEFINE_REG_UUID(keyword);
 
 DECLARE_TR_CTX(keyword_tr, SOF_UUID(keyword_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/samples/audio/smart_amp_test_ipc3.c b/src/samples/audio/smart_amp_test_ipc3.c
index db921a5b10d0..9de3bacb76d5 100644
--- a/src/samples/audio/smart_amp_test_ipc3.c
+++ b/src/samples/audio/smart_amp_test_ipc3.c
@@ -20,9 +20,7 @@ static const struct comp_driver comp_smart_amp;
 
 LOG_MODULE_REGISTER(smart_amp_test, CONFIG_SOF_LOG_LEVEL);
 
-/* 167a961e-8ae4-11ea-89f1-000c29ce1635 */
-SOF_DEFINE_UUID("smart_amp_test", smart_amp_test_uuid, 0x167a961e, 0x8ae4,
-		    0x11ea, 0x89, 0xf1, 0x00, 0x0c, 0x29, 0xce, 0x16, 0x35);
+SOF_DEFINE_REG_UUID(smart_amp_test);
 
 DECLARE_TR_CTX(smart_amp_test_comp_tr, SOF_UUID(smart_amp_test_uuid),
 	       LOG_LEVEL_INFO);
diff --git a/src/samples/audio/smart_amp_test_ipc4.c b/src/samples/audio/smart_amp_test_ipc4.c
index 8c198f4471a5..9017408cf235 100644
--- a/src/samples/audio/smart_amp_test_ipc4.c
+++ b/src/samples/audio/smart_amp_test_ipc4.c
@@ -21,9 +21,7 @@
 LOG_MODULE_REGISTER(smart_amp_test, CONFIG_SOF_LOG_LEVEL);
 #include <zephyr/logging/log.h>
 
-/* 167a961e-8ae4-11ea-89f1-000c29ce1635 */
-SOF_DEFINE_UUID("smart_amp_test", smart_amp_test_uuid, 0x167a961e, 0x8ae4,
-		    0x11ea, 0x89, 0xf1, 0x00, 0x0c, 0x29, 0xce, 0x16, 0x35);
+SOF_DEFINE_REG_UUID(smart_amp_test);
 
 DECLARE_TR_CTX(smart_amp_test_comp_tr, SOF_UUID(smart_amp_test_uuid),
 	       LOG_LEVEL_INFO);
diff --git a/src/schedule/edf_schedule.c b/src/schedule/edf_schedule.c
index d3ece283586f..11bf195dba7a 100644
--- a/src/schedule/edf_schedule.c
+++ b/src/schedule/edf_schedule.c
@@ -23,9 +23,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-/* 77de2074-828c-4044-a40b-420b72749e8b */
-SOF_DEFINE_UUID("edf_sched", edf_sched_uuid, 0x77de2074, 0x828c, 0x4044,
-		 0xa4, 0x0b, 0x42, 0x0b, 0x72, 0x74, 0x9e, 0x8b);
+SOF_DEFINE_REG_UUID(edf_sched);
 
 DECLARE_TR_CTX(edf_tr, SOF_UUID(edf_sched_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/schedule/ll_schedule.c b/src/schedule/ll_schedule.c
index acd3bd402e9a..d310f7d13105 100644
--- a/src/schedule/ll_schedule.c
+++ b/src/schedule/ll_schedule.c
@@ -35,9 +35,7 @@
 
 LOG_MODULE_REGISTER(ll_schedule, CONFIG_SOF_LOG_LEVEL);
 
-/* 4f9c3ec7-7b55-400c-86b3-502b4420e625 */
-SOF_DEFINE_UUID("ll_sched", ll_sched_uuid, 0x4f9c3ec7, 0x7b55, 0x400c,
-		 0x86, 0xb3, 0x50, 0x2b, 0x44, 0x20, 0xe6, 0x25);
+SOF_DEFINE_REG_UUID(ll_sched);
 
 DECLARE_TR_CTX(ll_tr, SOF_UUID(ll_sched_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/schedule/schedule.c b/src/schedule/schedule.c
index 76c797e2b65b..b8c6832b446b 100644
--- a/src/schedule/schedule.c
+++ b/src/schedule/schedule.c
@@ -18,9 +18,7 @@
 
 LOG_MODULE_REGISTER(schedule, CONFIG_SOF_LOG_LEVEL);
 
-/* 3dee06de-f25a-4e10-ae1f-abc9573873ea */
-SOF_DEFINE_UUID("schedule", schedule_uuid, 0x3dee06de, 0xf25a, 0x4e10,
-		 0xae, 0x1f, 0xab, 0xc9, 0x57, 0x38, 0x73, 0xea);
+SOF_DEFINE_REG_UUID(schedule);
 
 DECLARE_TR_CTX(sch_tr, SOF_UUID(schedule_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/schedule/task.c b/src/schedule/task.c
index 730fa11df406..bf55c70fec02 100644
--- a/src/schedule/task.c
+++ b/src/schedule/task.c
@@ -30,9 +30,7 @@
 
 typedef enum task_state (*task_main)(void *);
 
-/* 37f1d41f-252d-448d-b9c4-1e2bee8e1bf1 */
-SOF_DEFINE_UUID("main_task", main_task_uuid, 0x37f1d41f, 0x252d, 0x448d,
-		 0xb9, 0xc4, 0x1e, 0x2b, 0xee, 0x8e, 0x1b, 0xf1);
+SOF_DEFINE_REG_UUID(main_task);
 
 static void sys_module_init(void)
 {
diff --git a/src/schedule/zephyr_dp_schedule.c b/src/schedule/zephyr_dp_schedule.c
index bcced893d3dd..68f3fdc37e70 100644
--- a/src/schedule/zephyr_dp_schedule.c
+++ b/src/schedule/zephyr_dp_schedule.c
@@ -23,9 +23,7 @@
 #include <zephyr/kernel/thread.h>
 
 LOG_MODULE_REGISTER(dp_schedule, CONFIG_SOF_LOG_LEVEL);
-/* 87858bc2-baa9-40b6-8e4c-2c95ba8b1545 */
-SOF_DEFINE_UUID("dp_sched", dp_sched_uuid, 0x87858bc2, 0xbaa9, 0x40b6,
-		 0x8e, 0x4c, 0x2c, 0x95, 0xba, 0x8b, 0x15, 0x45);
+SOF_DEFINE_REG_UUID(dp_sched);
 
 DECLARE_TR_CTX(dp_tr, SOF_UUID(dp_sched_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/schedule/zephyr_ll.c b/src/schedule/zephyr_ll.c
index 5d5a0d07162c..4da220fee4d3 100644
--- a/src/schedule/zephyr_ll.c
+++ b/src/schedule/zephyr_ll.c
@@ -19,9 +19,7 @@
 
 LOG_MODULE_REGISTER(ll_schedule, CONFIG_SOF_LOG_LEVEL);
 
-/* 1547fe68-de0c-11eb-8461-3158a1294853 */
-SOF_DEFINE_UUID("zll_sched", zll_sched_uuid, 0x1547fe68, 0xde0c, 0x11eb,
-		 0x84, 0x61, 0x31, 0x58, 0xa1, 0x29, 0x48, 0x53);
+SOF_DEFINE_REG_UUID(zll_sched);
 
 DECLARE_TR_CTX(ll_tr, SOF_UUID(zll_sched_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/spinlock.c b/src/spinlock.c
index c9f08fa4447a..52e80a29ff42 100644
--- a/src/spinlock.c
+++ b/src/spinlock.c
@@ -14,9 +14,7 @@
 
 #if CONFIG_DEBUG_LOCKS
 
-/* 9d346d98-203d-4791-baee-1770a03d4a71 */
-SOF_DEFINE_UUID("spinlock", spinlock_uuid, 0x9d346d98, 0x203d, 0x4791,
-		 0xba, 0xee, 0x17, 0x70, 0xa0, 0x3d, 0x4a, 0x71);
+SOF_DEFINE_REG_UUID(spinlock);
 
 DECLARE_TR_CTX(sl_tr, SOF_UUID(spinlock_uuid), LOG_LEVEL_INFO);
 
diff --git a/src/trace/dma-trace.c b/src/trace/dma-trace.c
index 5947b5de1d56..a1dbda7d10bb 100644
--- a/src/trace/dma-trace.c
+++ b/src/trace/dma-trace.c
@@ -39,15 +39,11 @@
 
 LOG_MODULE_REGISTER(dma_trace, CONFIG_SOF_LOG_LEVEL);
 
-/* 58782c63-1326-4185-8459-22272e12d1f1 */
-SOF_DEFINE_UUID("dma_trace", dma_trace_uuid, 0x58782c63, 0x1326, 0x4185,
-		 0x84, 0x59, 0x22, 0x27, 0x2e, 0x12, 0xd1, 0xf1);
+SOF_DEFINE_REG_UUID(dma_trace);
 
 DECLARE_TR_CTX(dt_tr, SOF_UUID(dma_trace_uuid), LOG_LEVEL_INFO);
 
-/* 2b972272-c5b1-4b7e-926f-0fc5cb4c4690 */
-SOF_DEFINE_UUID("dma_trace_task", dma_trace_task_uuid, 0x2b972272, 0xc5b1,
-		 0x4b7e, 0x92, 0x6f, 0x0f, 0xc5, 0xcb, 0x4c, 0x46, 0x90);
+SOF_DEFINE_REG_UUID(dma_trace_task);
 
 static int dma_trace_get_avail_data(struct dma_trace_data *d,
 				    struct dma_trace_buf *buffer,
diff --git a/tools/plugin/modules/alsa.c b/tools/plugin/modules/alsa.c
index 8c0e4f1af3b8..8d45597d6227 100644
--- a/tools/plugin/modules/alsa.c
+++ b/tools/plugin/modules/alsa.c
@@ -30,14 +30,10 @@
 
 #include "pipe.h"
 
-/* 66def9f0-39f2-11ed-89f7-af98a6440cc4 */
-SOF_DEFINE_UUID("arecord", arecord_uuid, 0x66def9f0, 0x39f2, 0x11ed,
-		    0xf7, 0x89, 0xaf, 0x98, 0xa6, 0x44, 0x0c, 0xc4);
+SOF_DEFINE_REG_UUID(arecord);
 DECLARE_TR_CTX(arecord_tr, SOF_UUID(arecord_uuid), LOG_LEVEL_INFO);
 
-/* 72cee996-39f2-11ed-a08f-97fcc42eaaeb */
-SOF_DEFINE_UUID("aplay", aplay_uuid, 0x72cee996, 0x39f2, 0x11ed,
-		    0xa0, 0x8f, 0x97, 0xfc, 0xc4, 0x2e, 0xaa, 0xeb);
+SOF_DEFINE_REG_UUID(aplay);
 DECLARE_TR_CTX(aplay_tr, SOF_UUID(aplay_uuid), LOG_LEVEL_INFO);
 
 static const struct comp_driver comp_arecord;
diff --git a/tools/plugin/modules/ov_noise_suppression/noise_suppression.c b/tools/plugin/modules/ov_noise_suppression/noise_suppression.c
index 194b7e0596e7..06bf8ca149ef 100644
--- a/tools/plugin/modules/ov_noise_suppression/noise_suppression.c
+++ b/tools/plugin/modules/ov_noise_suppression/noise_suppression.c
@@ -29,9 +29,7 @@
 
 LOG_MODULE_REGISTER(ns, CONFIG_SOF_LOG_LEVEL);
 
-/* 7ae671a7-4617-4a09-bf6d-9d29c998dbc1 */
-SOF_DEFINE_UUID("ns", ns_uuid, 0x7ae671a7, 0x4617,
-		    0x4a09, 0xbf, 0x6d, 0x9d, 0x29, 0xc9, 0x98, 0xdb, 0xc1);
+SOF_DEFINE_REG_UUID(ns);
 
 DECLARE_TR_CTX(ns_comp_tr, SOF_UUID(ns_comp_uuid), LOG_LEVEL_INFO);
 
diff --git a/tools/plugin/modules/shm.c b/tools/plugin/modules/shm.c
index bd02cc0e0fe5..0e990bfe7cd0 100644
--- a/tools/plugin/modules/shm.c
+++ b/tools/plugin/modules/shm.c
@@ -29,14 +29,10 @@
 
 #include "pipe.h"
 
-/* 1488beda-e847-ed11-b309-a58b974fecce */
-SOF_DEFINE_UUID("shmread", shmread_uuid, 0xdabe8814, 0x47e8, 0x11ed,
-		    0xa5, 0x8b, 0xb3, 0x09, 0x97, 0x4f, 0xec, 0xce);
+SOF_DEFINE_REG_UUID(shmread);
 DECLARE_TR_CTX(shmread_tr, SOF_UUID(shmread_uuid), LOG_LEVEL_INFO);
 
-/* 1c03b6e2-e847-ed11-7f80-07a91b6efa6c */
-SOF_DEFINE_UUID("shmwrite", shmwrite_uuid, 0xe2b6031c, 0x47e8, 0x11ed,
-		    0x07, 0xa9, 0x7f, 0x80, 0x1b, 0x6e, 0xfa, 0x6c);
+SOF_DEFINE_REG_UUID(shmwrite);
 DECLARE_TR_CTX(shmwrite_tr, SOF_UUID(shmwrite_uuid), LOG_LEVEL_INFO);
 
 static const struct comp_driver comp_shmread;
diff --git a/tools/testbench/file.c b/tools/testbench/file.c
index 8e79f89f327c..1ce8b578d6c7 100644
--- a/tools/testbench/file.c
+++ b/tools/testbench/file.c
@@ -23,9 +23,7 @@
 #include "testbench/common_test.h"
 #include "testbench/file.h"
 
-/* bfc7488c-75aa-4ce8-9bde-d8da08a698c2 */
-SOF_DEFINE_UUID("file", file_uuid, 0xbfc7488c, 0x75aa, 0x4ce8,
-		    0x9d, 0xbe, 0xd8, 0xda, 0x08, 0xa6, 0x98, 0xc2);
+SOF_DEFINE_REG_UUID(file);
 DECLARE_TR_CTX(file_tr, SOF_UUID(file_uuid), LOG_LEVEL_INFO);
 
 static const struct comp_driver comp_file_dai;
diff --git a/zephyr/lib/pm_runtime.c b/zephyr/lib/pm_runtime.c
index 16a363e8c271..3f614683c8bc 100644
--- a/zephyr/lib/pm_runtime.c
+++ b/zephyr/lib/pm_runtime.c
@@ -14,9 +14,7 @@
 
 LOG_MODULE_REGISTER(power, CONFIG_SOF_LOG_LEVEL);
 
-/* 76cc9773-440c-4df9-95a8-72defe7796fc */
-SOF_DEFINE_UUID("power", power_uuid, 0x76cc9773, 0x440c, 0x4df9,
-		 0x95, 0xa8, 0x72, 0xde, 0xfe, 0x77, 0x96, 0xfc);
+SOF_DEFINE_REG_UUID(power);
 
 DECLARE_TR_CTX(power_tr, SOF_UUID(power_uuid), LOG_LEVEL_INFO);
 
diff --git a/zephyr/wrapper.c b/zephyr/wrapper.c
index eb502a28a339..e74b1abd466c 100644
--- a/zephyr/wrapper.c
+++ b/zephyr/wrapper.c
@@ -38,9 +38,7 @@ LOG_MODULE_REGISTER(zephyr, CONFIG_SOF_LOG_LEVEL);
 extern K_KERNEL_STACK_ARRAY_DEFINE(z_interrupt_stacks, CONFIG_MP_MAX_NUM_CPUS,
 				   CONFIG_ISR_STACK_SIZE);
 
-/* 300aaad4-45d2-8313-25d0-5e1d6086cdd1 */
-SOF_DEFINE_UUID("zephyr", zephyr_uuid, 0x300aaad4, 0x45d2, 0x8313,
-		 0x25, 0xd0, 0x5e, 0x1d, 0x60, 0x86, 0xcd, 0xd1);
+SOF_DEFINE_REG_UUID(zephyr);
 
 DECLARE_TR_CTX(zephyr_tr, SOF_UUID(zephyr_uuid), LOG_LEVEL_INFO);