diff --git a/src/config/00-audio-sink.endpoint b/src/config/00-audio-sink.endpoint
index ee55deb6c46864bebc7cce35261796b727818fc8..50088dadc876585882559efdbb7728f7ff732628 100644
--- a/src/config/00-audio-sink.endpoint
+++ b/src/config/00-audio-sink.endpoint
@@ -4,5 +4,5 @@ properties = [
 ]
 
 [endpoint]
-type = "pw-audio-softdsp-endpoint"
-direction = "sink"
+session = "audio"
+type = "si-adapter"
diff --git a/src/config/00-audio-source.endpoint b/src/config/00-audio-source.endpoint
index b77622f606e399a0b1c41b5be34f21ba2b0d9c04..18fdfd33d2322e23c6fb6a31c26989c7a07a8586 100644
--- a/src/config/00-audio-source.endpoint
+++ b/src/config/00-audio-source.endpoint
@@ -4,5 +4,5 @@ properties = [
 ]
 
 [endpoint]
-type = "pw-audio-softdsp-endpoint"
-direction = "source"
+session = "audio"
+type = "si-adapter"
diff --git a/src/config/00-stream-input-audio.endpoint b/src/config/00-stream-input-audio.endpoint
index 4cea1aa09baf1fd23a4f35f5a9fde5a395623ef5..e9fe1c3008a7647ad3ec53b925283a6837589a27 100644
--- a/src/config/00-stream-input-audio.endpoint
+++ b/src/config/00-stream-input-audio.endpoint
@@ -1,8 +1,8 @@
 [match-node]
 properties = [
-  { name = "media.class", value = "Stream/Input/Video" },
+  { name = "media.class", value = "Stream/Input/Audio" },
 ]
 
 [endpoint]
-direction = "sink"
-type = "video-endpoint"
+session = "audio"
+type = "si-adapter"
diff --git a/src/config/00-stream-input-video.endpoint b/src/config/00-stream-input-video.endpoint
index 0ef2c5b78df18194417234be0b16f37401e1814f..c48205d39865371f8a3a66f7e4435ef852a45d2b 100644
--- a/src/config/00-stream-input-video.endpoint
+++ b/src/config/00-stream-input-video.endpoint
@@ -1,8 +1,8 @@
 [match-node]
 properties = [
-  { name = "media.class", value = "Stream/Input/Audio" },
+  { name = "media.class", value = "Stream/Input/Video" },
 ]
 
 [endpoint]
-direction = "sink"
-type = "pw-audio-softdsp-endpoint"
+session = "video"
+type = "si-simple-node-endpoint"
diff --git a/src/config/00-stream-output-audio.endpoint b/src/config/00-stream-output-audio.endpoint
index 4e86323e2fa86af503e33a716df5201a3dc06340..7d24349df16875ca4c5fcd53cbe28f82df504873 100644
--- a/src/config/00-stream-output-audio.endpoint
+++ b/src/config/00-stream-output-audio.endpoint
@@ -4,5 +4,5 @@ properties = [
 ]
 
 [endpoint]
-direction = "source"
-type = "pw-audio-softdsp-endpoint"
+session = "audio"
+type = "si-adapter"
diff --git a/src/config/00-stream-output-video.endpoint b/src/config/00-stream-output-video.endpoint
index f6535f3b885d0829e66ed2eb281246a37c0328dd..4aef69f99335c47cedec7eb60e5cc04781f4c08e 100644
--- a/src/config/00-stream-output-video.endpoint
+++ b/src/config/00-stream-output-video.endpoint
@@ -4,5 +4,5 @@ properties = [
 ]
 
 [endpoint]
-direction = "source"
-type = "video-endpoint"
+session = "video"
+type = "si-simple-node-endpoint"
diff --git a/src/config/00-video-sink.endpoint b/src/config/00-video-sink.endpoint
index dd2b535accef0ac94689c7427a2f1212c8f046f2..ff9e6ac006f409e8d29e981f8726a14b4c42ba3b 100644
--- a/src/config/00-video-sink.endpoint
+++ b/src/config/00-video-sink.endpoint
@@ -4,5 +4,5 @@ properties = [
 ]
 
 [endpoint]
-type = "video-endpoint"
-direction = "sink"
+session = "video"
+type = "si-simple-node-endpoint"
diff --git a/src/config/00-video-source.endpoint b/src/config/00-video-source.endpoint
index 71bff4c289e39d45d0be6b5fe7ed4e6c8442890c..487f7d3f780483513b9ca54828fae4d5e97bdf9b 100644
--- a/src/config/00-video-source.endpoint
+++ b/src/config/00-video-source.endpoint
@@ -4,5 +4,5 @@ properties = [
 ]
 
 [endpoint]
-type = "video-endpoint"
-direction = "source"
+session = "video"
+type = "si-simple-node-endpoint"
diff --git a/src/config/01-hw:0,0-audio-sink.endpoint b/src/config/01-hw:0,0-audio-sink.endpoint
index 56a66ede1efe67282cd9b633fda411aefe537feb..28d8e307006013fef7dd24d5d87a92c726e6775e 100644
--- a/src/config/01-hw:0,0-audio-sink.endpoint
+++ b/src/config/01-hw:0,0-audio-sink.endpoint
@@ -5,6 +5,8 @@ properties = [
 ]
 
 [endpoint]
-type = "pw-audio-softdsp-endpoint"
-direction = "sink"
+session = "audio"
+type = "si-adapter"
+
+[endpoint.config]
 priority = 1
diff --git a/src/config/01-hw:0,0-audio-source.endpoint b/src/config/01-hw:0,0-audio-source.endpoint
index 671eff82de2430832285c4bfc30095405d7a5f3a..49ba693a0d52235e82e80f29b658e9112702c9ec 100644
--- a/src/config/01-hw:0,0-audio-source.endpoint
+++ b/src/config/01-hw:0,0-audio-source.endpoint
@@ -5,6 +5,8 @@ properties = [
 ]
 
 [endpoint]
-type = "pw-audio-softdsp-endpoint"
-direction = "source"
+session = "audio"
+type = "si-adapter"
+
+[endpoint.config]
 priority = 1