diff --git a/.gitmodules b/.gitmodules
index ac58ae1..dc07671 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "3rdparty/cpp-httplib"]
 	path = 3rdparty/cpp-httplib
 	url = https://github.com/bondagit/cpp-httplib.git
+[submodule "3rdparty/ravenna-alsa-lkm"]
+	path = 3rdparty/ravenna-alsa-lkm
+	url = https://github.com/bondagit/ravenna-alsa-lkm.git
+	branch = aes67-daemon
diff --git a/3rdparty/ravenna-alsa-lkm b/3rdparty/ravenna-alsa-lkm
new file mode 160000
index 0000000..9897287
--- /dev/null
+++ b/3rdparty/ravenna-alsa-lkm
@@ -0,0 +1 @@
+Subproject commit 989728785990592cd3544e54d767beab97366fc6
diff --git a/build.sh b/build.sh
index 9153306..c03717b 100755
--- a/build.sh
+++ b/build.sh
@@ -12,14 +12,6 @@ TOPDIR=$(pwd)
 echo "Init git submodules ..."
 git submodule update --init --recursive
 
-cd 3rdparty
-if [ ! -d ravenna-alsa-lkm ]; then
-  git clone --single-branch --branch aes67-daemon https://github.com/bondagit/ravenna-alsa-lkm.git
-  cd ravenna-alsa-lkm/driver
-  make
-  cd ../..
-fi
-
 cd webui
 echo "Downloading current webui release ..."
 wget --timestamping https://github.com/bondagit/aes67-linux-daemon/releases/latest/download/webui.tar.gz
diff --git a/buildfake.sh b/buildfake.sh
index 6c6f41b..28d5573 100755
--- a/buildfake.sh
+++ b/buildfake.sh
@@ -12,12 +12,6 @@ TOPDIR=$(pwd)
 git config --global http.sslverify false
 git submodule update --init --recursive
 
-cd 3rdparty
-if [ ! -d ravenna-alsa-lkm ]; then
-  git clone --single-branch --branch aes67-daemon https://github.com/bondagit/ravenna-alsa-lkm.git
-fi
-cd ..
-
 cd daemon
 echo "Building aes67-daemon ..."
 cmake \
@@ -26,6 +20,7 @@ cmake \
 	-DENABLE_TESTS=ON \
 	-DWITH_AVAHI=OFF \
 	-DFAKE_DRIVER=ON \
+	-DWITH_STREAMER=OFF \
 	.
 make
 cd ..
diff --git a/daemon/tests/daemon.conf b/daemon/tests/daemon.conf
index ae6a95f..07a967e 100644
--- a/daemon/tests/daemon.conf
+++ b/daemon/tests/daemon.conf
@@ -17,7 +17,7 @@
   "syslog_server": "255.255.255.254:1234",
   "status_file": "",
   "interface_name": "lo",
-  "mdns_enabled": true,
+  "mdns_enabled": false,
   "custom_node_id": "test node",
   "node_id": "test node",
   "ptp_status_script": "",
diff --git a/daemon/tests/daemon_test.cpp b/daemon/tests/daemon_test.cpp
index 940c05c..8c06b23 100644
--- a/daemon/tests/daemon_test.cpp
+++ b/daemon/tests/daemon_test.cpp
@@ -430,7 +430,7 @@ BOOST_AUTO_TEST_CASE(get_config) {
   BOOST_CHECK_MESSAGE(node_id == "test node", "config as excepcted");
   BOOST_CHECK_MESSAGE(custom_node_id == "test node", "config as excepcted");
   BOOST_CHECK_MESSAGE(auto_sinks_update == true, "config as excepcted");
-  BOOST_CHECK_MESSAGE(mdns_enabled == true, "config as excepcted");
+  BOOST_CHECK_MESSAGE(mdns_enabled == false, "config as excepcted");
   BOOST_CHECK_MESSAGE(streamer_enabled == false, "config as excepcted");
   BOOST_CHECK_MESSAGE(streamer_channels == 8, "config as excepcted");
   BOOST_CHECK_MESSAGE(streamer_files_num == 6, "config as excepcted");