diff --git a/bitbots_behavior/bitbots_body_behavior/bitbots_body_behavior/body_behavior.py b/bitbots_behavior/bitbots_body_behavior/bitbots_body_behavior/body_behavior.py
index 640ff0f3e..2e97d9630 100644
--- a/bitbots_behavior/bitbots_body_behavior/bitbots_body_behavior/body_behavior.py
+++ b/bitbots_behavior/bitbots_body_behavior/bitbots_body_behavior/body_behavior.py
@@ -22,7 +22,7 @@ def __init__(self, node: Node):
         self.step_running = False
         self.node = node
 
-        self.tf_buffer = Buffer(node, Duration(seconds=30))
+        self.tf_buffer = Buffer(Duration(seconds=30), node)
 
         blackboard = BodyBlackboard(node, self.tf_buffer)
         self.dsd = DSD(blackboard, "debug/dsd/body_behavior", node)  # TODO: use config
diff --git a/bitbots_navigation/bitbots_path_planning/bitbots_path_planning/path_planning.py b/bitbots_navigation/bitbots_path_planning/bitbots_path_planning/path_planning.py
index 0a17d86e8..70b92104d 100644
--- a/bitbots_navigation/bitbots_path_planning/bitbots_path_planning/path_planning.py
+++ b/bitbots_navigation/bitbots_path_planning/bitbots_path_planning/path_planning.py
@@ -21,7 +21,7 @@ def __init__(self) -> None:
         super().__init__("bitbots_path_planning")
 
         # We need to create a tf buffer
-        self.tf_buffer = Buffer(self, Duration(seconds=self.config.tf_buffer_duration))
+        self.tf_buffer = Buffer(Duration(seconds=self.config.tf_buffer_duration), self)
 
         self.planner = VisibilityPlanner(node=self, buffer=self.tf_buffer)
         self.controller = Controller(node=self, buffer=self.tf_buffer)
diff --git a/bitbots_team_communication/bitbots_team_communication/bitbots_team_communication/bitbots_team_communication.py b/bitbots_team_communication/bitbots_team_communication/bitbots_team_communication/bitbots_team_communication.py
index 210164c33..e7ea7a5c3 100755
--- a/bitbots_team_communication/bitbots_team_communication/bitbots_team_communication/bitbots_team_communication.py
+++ b/bitbots_team_communication/bitbots_team_communication/bitbots_team_communication/bitbots_team_communication.py
@@ -60,7 +60,7 @@ def __init__(self):
 
         self.set_state_defaults()
 
-        self.tf_buffer = Buffer(self.node)
+        self.tf_buffer = Buffer(node=self.node)
 
         self.run_spin_in_thread()
         self.try_to_establish_connection()
diff --git a/bitbots_world_model/bitbots_ball_filter/bitbots_ball_filter/ball_filter.py b/bitbots_world_model/bitbots_ball_filter/bitbots_ball_filter/ball_filter.py
index 8d9a5e66c..971358482 100755
--- a/bitbots_world_model/bitbots_ball_filter/bitbots_ball_filter/ball_filter.py
+++ b/bitbots_world_model/bitbots_ball_filter/bitbots_ball_filter/ball_filter.py
@@ -32,7 +32,7 @@ def __init__(self) -> None:
         """
         super().__init__("ball_filter")
         self.logger = self.get_logger()
-        self.tf_buffer = Buffer(self, Duration(seconds=2))
+        self.tf_buffer = Buffer(Duration(seconds=2), self)
         # Setup dynamic reconfigure config
         self.param_listener = parameters.ParamListener(self)
 
diff --git a/bitbots_world_model/bitbots_robot_filter/bitbots_robot_filter/filter.py b/bitbots_world_model/bitbots_robot_filter/bitbots_robot_filter/filter.py
index 1e57ef397..315a3bc56 100644
--- a/bitbots_world_model/bitbots_robot_filter/bitbots_robot_filter/filter.py
+++ b/bitbots_world_model/bitbots_robot_filter/bitbots_robot_filter/filter.py
@@ -20,7 +20,7 @@ class RobotFilter(Node):
     def __init__(self):
         super().__init__("bitbots_robot_filter")
 
-        self.tf_buffer = Buffer(self, Duration(seconds=10.0))
+        self.tf_buffer = Buffer(Duration(seconds=10.0), self)
 
         self.robots: list[tuple[sv3dm.Robot, Time]] = list()
         self.team: dict[int, TeamData] = dict()