diff --git a/src/conf/ucm/VEYRON-I2S/HiFi.conf b/src/conf/ucm/VEYRON-I2S/HiFi.conf
index 292b8fca..6dddf9af 100644
--- a/src/conf/ucm/VEYRON-I2S/HiFi.conf
+++ b/src/conf/ucm/VEYRON-I2S/HiFi.conf
@@ -47,9 +47,45 @@ SectionVerb {
 	]
 }
 
+SectionDevice."Speaker".0 {
+	Comment "Speaker"
+	Value {
+		PlaybackPCM "hw:VEYRONI2S,0"
+	}
+	EnableSequence [
+		cdev "hw:VEYRONI2S"
+
+		cset "name='Speaker Switch' on"
+	]
+	DisableSequence [
+		cdev "hw:VEYRONI2S"
+
+		cset "name='Speaker Switch' off"
+	]
+}
+
+SectionDevice."Internal Mic".0 {
+	Comment "Int Mic"
+	Value {
+		CapturePCM "hw:VEYRONI2S,0"
+	}
+	EnableSequence [
+		cdev "hw:VEYRONI2S"
+
+		cset "name='Int Mic Switch' on"
+	]
+	DisableSequence [
+		cdev "hw:VEYRONI2S"
+
+		cset "name='Int Mic Switch' off"
+	]
+}
+
 SectionDevice."Headphone".0 {
+	Comment "Headphone"
 	Value {
 		JackName "VEYRON-I2S Headset Jack"
+		PlaybackPCM "hw:VEYRONI2S,0"
 		OutputDspName ""
 	}
 
@@ -70,8 +106,10 @@ SectionDevice."Headphone".0 {
 }
 
 SectionDevice."Mic".0 {
+	Comment "Headset Mic"
 	Value {
 		JackName "VEYRON-I2S Headset Jack"
+		CapturePCM "hw:VEYRONI2S,0"
 	}
 
 	EnableSequence [