diff --git a/tools/topology/topology2/cavs-nocodec-bt.conf b/tools/topology/topology2/cavs-nocodec-bt.conf
index 4fb5c1babb91..5251027afe6f 100644
--- a/tools/topology/topology2/cavs-nocodec-bt.conf
+++ b/tools/topology/topology2/cavs-nocodec-bt.conf
@@ -77,7 +77,8 @@ Object.Dai {
 		sample_bits		32
 		quirks			"lbm_mode"
 		io_clk		$MCLK
-		Object.Base.hw_config."SSP0" {
+		Object.Base.hw_config.1 {
+			name	"SSP0"
 			id      0
 			mclk_freq       $MCLK
 			bclk_freq       3072000
@@ -94,7 +95,8 @@ Object.Dai {
 		quirks			"lbm_mode"
 		io_clk		$MCLK
 
-		Object.Base.hw_config."SSP1" {
+		Object.Base.hw_config.1 {
+			name	"SSP1"
 			id	0
 			mclk_freq	$MCLK
 			bclk_freq	3072000
@@ -237,14 +239,18 @@ Object.PCM {
 		name	"Port0"
 		id 0
 		direction	"duplex"
-		Object.Base.fe_dai."Port0" {}
+		Object.Base.fe_dai.1 {
+			name	"Port0"
+		}
 
-		Object.PCM.pcm_caps."playback" {
+		Object.PCM.pcm_caps.1 {
+			direction "playback"
 			name "SSP0 Playback"
 			formats 'S16_LE,S24_LE,S32_LE'
 		}
 
-		Object.PCM.pcm_caps."capture" {
+		Object.PCM.pcm_caps.2 {
+			direction "capture"
 			name "SSP0 Capture"
 			formats 'S16_LE,S24_LE,S32_LE'
 		}
@@ -253,14 +259,18 @@ Object.PCM {
 		name	"Port1"
 		id 1
 		direction	"duplex"
-		Object.Base.fe_dai."Port1" {}
+		Object.Base.fe_dai.1 {
+			name	"Port1"
+		}
 
-		Object.PCM.pcm_caps."playback" {
+		Object.PCM.pcm_caps.1 {
+			direction "playback"
 			name "SSP1 Playback"
 			formats 'S16_LE,S24_LE,S32_LE'
 		}
 
-		Object.PCM.pcm_caps."capture" {
+		Object.PCM.pcm_caps.2 {
+			direction "capture"
 			name "SSP1 Capture"
 			formats 'S16_LE,S24_LE,S32_LE'
 		}
diff --git a/tools/topology/topology2/platform/intel/bt-generic.conf b/tools/topology/topology2/platform/intel/bt-generic.conf
index c4da50ab971b..543c492dd8f3 100644
--- a/tools/topology/topology2/platform/intel/bt-generic.conf
+++ b/tools/topology/topology2/platform/intel/bt-generic.conf
@@ -210,9 +210,12 @@ Object.PCM {
 		id 		$BT_PCM_ID
 		direction	"duplex"
 
-		Object.Base.fe_dai."Port2" {}
+		Object.Base.fe_dai.1 {
+			name	"Port2"
+		}
 
-		Object.PCM.pcm_caps."playback" {
+		Object.PCM.pcm_caps.1 {
+			direction   "playback"
 			name $BT_PB_PCM_CAPS
 			formats	'S16_LE'
 			rate_min 8000
@@ -221,7 +224,8 @@ Object.PCM {
 			channels_max 2
 		}
 
-		Object.PCM.pcm_caps."capture" {
+		Object.PCM.pcm_caps.2 {
+			direction   "capture"
 			name	$BT_CP_PCM_CAPS
 			formats 'S16_LE'
 			rate_min 8000
diff --git a/west.yml b/west.yml
index 48176be00051..6df80cdd7cc6 100644
--- a/west.yml
+++ b/west.yml
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: d9c4ec31fc49e7eef3c8c3b0d07827cc04e6efee
+      revision: ad19019b29a2b1586b6061cc36a7254e645ebc45
       remote: zephyrproject
       # Import some projects listed in zephyr/west.yml@revision
       #