diff --git a/src/daemon/pipewire-aes67.conf.in b/src/daemon/pipewire-aes67.conf.in
index 94713ef59..8e93036e4 100644
--- a/src/daemon/pipewire-aes67.conf.in
+++ b/src/daemon/pipewire-aes67.conf.in
@@ -18,6 +18,29 @@ context.properties = {
     #default.clock.quantum-limit = 8192
 }
 
+context.spa-libs = {
+    support.*       = support/libspa-support
+}
+
+context.objects = [
+    # An example clock reading from /dev/ptp0. Another option is to sync the
+    # ptp clock to CLOCK_TAI and then set clock.id = tai.
+    # If both device and ID are given and available, device takes precedence
+    { factory = spa-node-factory
+        args = {
+            factory.name    = support.node.driver
+            node.name       = PTP0-Driver
+            node.group      = pipewire.ptp0
+            # This driver should only be used for network nodes marked with group
+            priority.driver = 0
+            clock.name      = "clock.system.ptp0"
+            clock.device    = "/dev/ptp0"
+            clock.id        = tai
+            object.export   = true
+        }
+    }
+]
+
 context.modules = [
     { name = libpipewire-module-rt
         args = {
@@ -30,6 +53,7 @@ context.modules = [
     }
     { name = libpipewire-module-protocol-native }
     { name = libpipewire-module-client-node }
+    { name = libpipewire-module-spa-node-factory }
     { name = libpipewire-module-adapter }
     { name = libpipewire-module-rtp-sap
         args = {
@@ -52,6 +76,7 @@ context.modules = [
                             media.class = "Audio/Source"
                             device.api = aes67
                             sess.latency.msec = 10
+                            node.group = pipewire.ptp0
                         }
                     }
                 },
@@ -97,6 +122,7 @@ context.modules = [
                 device.api = aes67
                 sess.sap.announce = true
                 node.always-process = true
+                node.group = pipewire.ptp0
             }
         }
     },
diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
index 17ea656bf..27051d66e 100644
--- a/src/daemon/pipewire.conf.in
+++ b/src/daemon/pipewire.conf.in
@@ -221,21 +221,6 @@ context.objects = [
             node.freewheel  = true
         }
     }
-    # An example clock reading from /dev/ptp0. Another option is to sync the
-    # ptp clock to CLOCK_TAI and then set clock.id = tai.
-    # If both device and ID are given and available, device takes precedence
-    { factory = spa-node-factory
-        args = {
-            factory.name    = support.node.driver
-            node.name       = PTP0-Driver
-            node.group      = pipewire.ptp0
-            # This driver should only be used for network nodes marked with group
-            priority.driver = 0
-            clock.name      = "clock.system.ptp0"
-            clock.device    = "/dev/ptp0"
-            clock.id        = tai
-        }
-    }
 
     # This creates a new Source node. It will have input ports
     # that you can link, to provide audio for this source.