diff --git a/.gitmodules b/.gitmodules
index 26527065..2b39b086 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -127,9 +127,9 @@
 [submodule "packages/vyos-1x"]
 	path = packages/vyos-1x
 	url = https://github.com/vyos/vyos-1x.git
-[submodule "packages/vyos-cfg-avahi"]
-	path = packages/vyos-cfg-avahi
-	url = https://github.com/c-po/vyos-cfg-avahi.git
 [submodule "packages/vyos-bcast-relay"]
 	path = packages/vyos-bcast-relay
 	url = https://github.com/c-po/vyos-bcast-relay.git
+[submodule "packages/mdns-repeater"]
+	path = packages/mdns-repeater
+	url = https://github.com/vyos/mdns-repeater.git
diff --git a/data/live-build-config/hooks/18-enable-disable_services.chroot b/data/live-build-config/hooks/18-enable-disable_services.chroot
index b6609fa7..6ba7950f 100755
--- a/data/live-build-config/hooks/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/18-enable-disable_services.chroot
@@ -28,5 +28,5 @@ systemctl disable lldpd
 systemctl enable ssh-session-cleanup
 /usr/sbin/update-rc.d -f conntrackd remove
 systemctl disable conntrackd
-/usr/sbin/update-rc.d -f avahi-daemon remove
-systemctl disable avahi-daemon
+/usr/sbin/update-rc.d -f mdns-repeater remove
+systemctl disable mdns-repeater
diff --git a/packages/mdns-repeater b/packages/mdns-repeater
new file mode 160000
index 00000000..05197745
--- /dev/null
+++ b/packages/mdns-repeater
@@ -0,0 +1 @@
+Subproject commit 051977458f4078a06008bb6c6fd338cd994cf56c
diff --git a/packages/vyos-1x b/packages/vyos-1x
index ac6071ae..ae1e4c70 160000
--- a/packages/vyos-1x
+++ b/packages/vyos-1x
@@ -1 +1 @@
-Subproject commit ac6071ae85bee52793f6dc34c2b60e333149291b
+Subproject commit ae1e4c704bb324831fb15b6e243710f94700d3f2
diff --git a/packages/vyos-cfg-avahi b/packages/vyos-cfg-avahi
deleted file mode 160000
index 31448bde..00000000
--- a/packages/vyos-cfg-avahi
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 31448bde1bc3484bf62114f168749d418bf70b0d
diff --git a/packages/vyos-world b/packages/vyos-world
index 416bee9c..bd86d016 160000
--- a/packages/vyos-world
+++ b/packages/vyos-world
@@ -1 +1 @@
-Subproject commit 416bee9c0a634f8513904f18556bb6d40e9fd2a8
+Subproject commit bd86d016c2e0d5342f9610c28855f13d0316acfd