diff --git a/.baedeker/rewrites.example.jsonnet b/.baedeker/rewrites.example.jsonnet
index 3c458ddaaa..e4289a1309 100644
--- a/.baedeker/rewrites.example.jsonnet
+++ b/.baedeker/rewrites.example.jsonnet
@@ -6,13 +6,20 @@ local dotenv = {
 };
 
 function(prev, repoDir)
-  (import 'baedeker-library/ops/rewrites.libsonnet').rewriteNodePaths({
-    'bin/unique': '%s/target/release/unique-collator' % repoDir,
-    'bin/polkadot': { dockerImage: 'uniquenetwork/builder-polkadot:%s' % dotenv.POLKADOT_MAINNET_BRANCH },
-    'bin/acala': { dockerImage: 'uniquenetwork/builder-acala:%s' % dotenv.ACALA_BUILD_BRANCH },
-    'bin/moonbeam': { dockerImage: 'uniquenetwork/builder-moonbeam:%s' % dotenv.MOONBEAM_BUILD_BRANCH },
-    'bin/cumulus': { dockerImage: 'uniquenetwork/builder-cumulus:%s' % dotenv.STATEMINE_BUILD_BRANCH },
-    'bin/astar': { dockerImage: 'uniquenetwork/builder-astar:%s' % dotenv.ASTAR_BUILD_BRANCH },
-    'bin/polkadex': { dockerImage: 'uniquenetwork/builder-polkadex:%s' % dotenv.POLKADEX_BUILD_BRANCH },
-    'bin/hydradx': { dockerImage: 'uniquenetwork/builder-hydraDx:%s' % dotenv.HYDRADX_BUILD_BRANCH },
-  })(prev)
+  (import 'baedeker-library/ops/rewrites.libsonnet').rewriteNodePaths(
+    {
+      'bin/unique': '%s/target/release/unique-collator' % repoDir,
+      'bin/polkadot': { dockerImage: 'uniquenetwork/builder-polkadot:%s' % dotenv.POLKADOT_MAINNET_BRANCH },
+      'bin/acala': { dockerImage: 'uniquenetwork/builder-acala:%s' % dotenv.ACALA_BUILD_BRANCH },
+      'bin/moonbeam': { dockerImage: 'uniquenetwork/builder-moonbeam:%s' % dotenv.MOONBEAM_BUILD_BRANCH },
+      'bin/cumulus': { dockerImage: 'uniquenetwork/builder-cumulus:%s' % dotenv.STATEMINE_BUILD_BRANCH },
+      'bin/astar': { dockerImage: 'uniquenetwork/builder-astar:%s' % dotenv.ASTAR_BUILD_BRANCH },
+      'bin/polkadex': { dockerImage: 'uniquenetwork/builder-polkadex:%s' % dotenv.POLKADEX_BUILD_BRANCH },
+      'bin/hydradx': { dockerImage: 'uniquenetwork/builder-hydraDx:%s' % dotenv.HYDRADX_BUILD_BRANCH },
+    },
+    extra_node_mixin={
+      extraArgs+: [
+        '-lxcm=trace',
+      ],
+    },
+  )(prev)
diff --git a/.baedeker/xcm-opal.jsonnet b/.baedeker/xcm-opal.jsonnet
index c466f24617..e70e9c89fa 100644
--- a/.baedeker/xcm-opal.jsonnet
+++ b/.baedeker/xcm-opal.jsonnet
@@ -19,9 +19,6 @@ local relay = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'relay',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob', 'charlie', 'dave', 'eve']
 	},
@@ -38,9 +35,6 @@ local opal = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
@@ -58,9 +52,6 @@ local westmint = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
diff --git a/.baedeker/xcm-quartz.jsonnet b/.baedeker/xcm-quartz.jsonnet
index 38b801727d..68312dc538 100644
--- a/.baedeker/xcm-quartz.jsonnet
+++ b/.baedeker/xcm-quartz.jsonnet
@@ -24,9 +24,6 @@ local relay = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'relay',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie']
 	},
@@ -43,9 +40,6 @@ local quartz = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
@@ -66,9 +60,6 @@ local karura = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
@@ -88,9 +79,6 @@ local moonriver = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para-nimbus',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alith', 'baltathar']
 	},
@@ -108,9 +96,6 @@ local statemine = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
@@ -128,9 +113,6 @@ local shiden = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
diff --git a/.baedeker/xcm-unique.jsonnet b/.baedeker/xcm-unique.jsonnet
index 3c3d66e0c0..06d8ec7903 100644
--- a/.baedeker/xcm-unique.jsonnet
+++ b/.baedeker/xcm-unique.jsonnet
@@ -25,9 +25,6 @@ local relay = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'relay',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie', 'gregory', 'holly']
 	},
@@ -44,9 +41,6 @@ local unique = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
@@ -67,9 +61,6 @@ local acala = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
@@ -89,9 +80,6 @@ local moonbeam = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para-nimbus',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alith', 'baltathar']
 	},
@@ -109,9 +97,6 @@ local statemint = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para-ed',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
@@ -129,9 +114,6 @@ local astar = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
@@ -149,9 +131,6 @@ local polkadex = {
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},
@@ -170,9 +149,6 @@ local hydraDx = {
 			bin: $.bin,
 			wantedKeys: 'para',
 			legacyRpc: true,
-			extraArgs: [
-				"-lxcm=trace"
-			],
 		},
 		for name in ['alice', 'bob']
 	},