diff --git a/ucm2/Intel/sof-essx8336/HiFi.conf b/ucm2/Intel/sof-essx8336/HiFi.conf
index 974a80aa..a53f444a 100644
--- a/ucm2/Intel/sof-essx8336/HiFi.conf
+++ b/ucm2/Intel/sof-essx8336/HiFi.conf
@@ -1,35 +1,24 @@
 SectionVerb {
 	EnableSequence [
-		disdevall ""
+		#disdevall ""
 		# Disable all inputs / outputs
 		#   (may be duplicated with disdevall)
-		cset "name='Headphone Switch' off"
-		cset "name='Headset Mic Switch' off"
-		cset "name='Internal Mic Switch' off"
-		cset "name='DAC Mono Mix Switch' off"
+		cset "name='Left Headphone Mixer Left DAC Switch' on"
+		cset "name='Right Headphone Mixer Right DAC Switch' on"
 	]
 }
 
-If.amic {
-	Condition {
-		Type String
-		Empty "${var:DeviceDmic}"
-	}
-	True.SectionDevice."Mic" {
+SectionDevice."Mic" {
 		Comment "Analog Microphone"
 
-		ConflictingDevice [
-			"Headset"
-		]
-
 		EnableSequence [
-			cset "name='Differential Mux' lin1-rin1"
 			cset "name='Internal Mic Switch' on"
+			cset "name='Headset Mic Switch' on"
 		]
 
 		DisableSequence [
-			cset "name='Internal Mic Switch' off"
-		]
+
+				]
 
 		Value {
 			CapturePriority 100
@@ -37,35 +26,6 @@ If.amic {
 			CaptureMixerElem "ADC PGA Gain"
 			CaptureMasterElem "ADC"
 		}
-	}
-}
-
-If.dmic {
-	Condition {
-		Type String
-		Empty "${var:DeviceDmic}"
-	}
-	False.SectionDevice."${var:DeviceDmic}" {
-		Comment "Digital Microphone"
-
-		Value {
-			CapturePriority 100
-			CapturePCM "hw:${CardId},1"
-			If.chn {
-				Condition {
-					Type RegexMatch
-					Regex "cfg-dmics:[34]"
-					String "${CardComponents}"
-				}
-				True {
-					CaptureChannels 4
-				}
-			}
-			CaptureMixerElem "Dmic0"
-			CaptureVolume "Dmic0 Capture Volume"
-			CaptureSwitch "Dmic0 Capture Switch"
-		}
-	}
 }
 
 SectionDevice."Speaker" {
@@ -77,10 +37,12 @@ SectionDevice."Speaker" {
 
 	EnableSequence [
 		cset "name='Speaker Switch' on"
+		cset "name='Differential Mux' lin1-rin1"
 	]
 
 	DisableSequence [
 		cset "name='Speaker Switch' off"
+		cset "name='Differential Mux' lin2-rin2"
 	]
 	Value {
 		PlaybackPriority 100
@@ -98,6 +60,16 @@ SectionDevice."Headphones" {
 	ConflictingDevice [
 		"Speaker"
 	]
+	
+	EnableSequence [
+                cset "name='Headset Mic Switch' on"
+                cset "name='Speaker Switch' off"
+                cset "name='Differential Mux' lin2-rin2"
+        ]
+        
+        DisableSequence [
+		cset "name='Differential Mux' lin1-rin1"
+	]
 
 	Value {
 		PlaybackPriority 300
@@ -109,35 +81,4 @@ SectionDevice."Headphones" {
 	}
 }
 
-SectionDevice."Headset" {
-	Comment "Headset Microphone"
-
-	If.conflict {
-		Condition {
-			Type String
-			Empty "${var:DeviceDmic}"
-		}
-		True.ConflictingDevice [
-			"Mic"
-		]
-	}
-
-	EnableSequence [
-		cset "name='Headset Switch' on"
-		cset "name='Digital Mic Mux' 'dmic disable'"
-	]
-
-	DisableSequence [
-		cset "name='Headset Switch' on"
-	]
-
-	Value {
-		CapturePriority 300
-		CapturePCM "hw:${CardId}"
-		CaptureMixerElem "ADC PGA Gain"
-		CaptureMasterElem "ADC"
-		JackControl "Headset Mic Jack"
-	}
-}
-
 Include.hdmi.File "/Intel/sof-essx8336/Hdmi.conf"