diff --git a/meta-labgrid b/meta-labgrid
index ecd8d25a..c30ffd63 160000
--- a/meta-labgrid
+++ b/meta-labgrid
@@ -1 +1 @@
-Subproject commit ecd8d25ae7bd0a02f434a31a0986c88ac851ef4b
+Subproject commit c30ffd63a9865c9c43420b5f97425353657dea45
diff --git a/meta-lxatac-software/recipes-core/images/lxatac-core-image-base.bb b/meta-lxatac-software/recipes-core/images/lxatac-core-image-base.bb
index 36129e07..1836a59a 100644
--- a/meta-lxatac-software/recipes-core/images/lxatac-core-image-base.bb
+++ b/meta-lxatac-software/recipes-core/images/lxatac-core-image-base.bb
@@ -99,6 +99,7 @@ IMAGE_INSTALL:append = "\
     pps-tools \
     pv \
     python3-labgrid \
+    python3-labgrid-coordinator \
     python3-lxa-iobus \
     python3-pygobject \
     python3-usbmuxctl \
diff --git a/meta-lxatac-software/recipes-devtools/python/python3-labgrid_%.bbappend b/meta-lxatac-software/recipes-devtools/python/python3-labgrid_%.bbappend
index f77f661e..8b0831c0 100644
--- a/meta-lxatac-software/recipes-devtools/python/python3-labgrid_%.bbappend
+++ b/meta-lxatac-software/recipes-devtools/python/python3-labgrid_%.bbappend
@@ -4,6 +4,8 @@ SRC_URI += "file://userconfig.yaml \
             file://labgrid.conf \
             "
 
+SYSTEMD_AUTO_ENABLE:${PN}-coordinator = "disable"
+
 do_install:append() {
     # The userconfig.yaml is migrated via rauc hook between installs.
     # Deploy a copy of the file so that users can go back to a default config