diff --git a/resources/profiles/BBL/filament/Bambu PETG HF @BBL H2D 0.4 nozzle.json b/resources/profiles/BBL/filament/Bambu PETG HF @BBL H2D 0.4 nozzle.json
index f00a244802..01069e3d6b 100644
--- a/resources/profiles/BBL/filament/Bambu PETG HF @BBL H2D 0.4 nozzle.json	
+++ b/resources/profiles/BBL/filament/Bambu PETG HF @BBL H2D 0.4 nozzle.json	
@@ -27,6 +27,10 @@
         "nil",
         "nil"
     ],
+    "filament_extruder_variant": [
+        "Direct Drive Standard",
+        "Direct Drive High Flow"
+    ],
     "filament_flow_ratio": [
         "0.95",
         "0.95"
@@ -44,8 +48,16 @@
         "nil"
     ],
     "filament_max_volumetric_speed": [
-        "24",
-        "32"
+        "25",
+        "35"
+    ],
+    "filament_pre_cooling_temperature": [
+        "0",
+        "0"
+    ],
+    "filament_ramming_travel_time": [
+        "0",
+        "0"
     ],
     "filament_ramming_volumetric_speed": [
         "-1",
@@ -95,18 +107,6 @@
         "nil",
         "nil"
     ],
-    "filament_extruder_variant": [
-        "Direct Drive Standard",
-        "Direct Drive High Flow"
-    ],
-    "filament_pre_cooling_temperature": [
-        "0",
-        "0"
-    ],
-    "filament_ramming_travel_time": [
-        "0",
-        "0"
-    ],
     "hole_coef_2": [
         "-0.008"
     ],
diff --git a/resources/profiles/BBL/filament/Bambu PETG HF @BBL H2D 0.6 nozzle.json b/resources/profiles/BBL/filament/Bambu PETG HF @BBL H2D 0.6 nozzle.json
index fada69a05e..a9eb7999db 100644
--- a/resources/profiles/BBL/filament/Bambu PETG HF @BBL H2D 0.6 nozzle.json	
+++ b/resources/profiles/BBL/filament/Bambu PETG HF @BBL H2D 0.6 nozzle.json	
@@ -15,6 +15,10 @@
         "nil",
         "nil"
     ],
+    "filament_extruder_variant": [
+        "Direct Drive Standard",
+        "Direct Drive High Flow"
+    ],
     "filament_flow_ratio": [
         "0.95",
         "0.95"
@@ -32,8 +36,16 @@
         "nil"
     ],
     "filament_max_volumetric_speed": [
-        "24",
-        "24"
+        "30",
+        "40"
+    ],
+    "filament_pre_cooling_temperature": [
+        "0",
+        "0"
+    ],
+    "filament_ramming_travel_time": [
+        "0",
+        "0"
     ],
     "filament_ramming_volumetric_speed": [
         "-1",
@@ -83,18 +95,6 @@
         "Spiral Lift",
         "Spiral Lift"
     ],
-    "filament_extruder_variant": [
-        "Direct Drive Standard",
-        "Direct Drive High Flow"
-    ],
-    "filament_pre_cooling_temperature": [
-        "0",
-        "0"
-    ],
-    "filament_ramming_travel_time": [
-        "0",
-        "0"
-    ],
     "long_retractions_when_ec": [
         "1",
         "1"
diff --git a/resources/profiles/BBL/filament/Bambu PLA Basic @BBL H2D 0.8 nozzle.json b/resources/profiles/BBL/filament/Bambu PLA Basic @BBL H2D 0.8 nozzle.json
index f7649f8b53..01537216b6 100644
--- a/resources/profiles/BBL/filament/Bambu PLA Basic @BBL H2D 0.8 nozzle.json	
+++ b/resources/profiles/BBL/filament/Bambu PLA Basic @BBL H2D 0.8 nozzle.json	
@@ -18,6 +18,10 @@
         "nil",
         "nil"
     ],
+    "filament_extruder_variant": [
+        "Direct Drive Standard",
+        "Direct Drive High Flow"
+    ],
     "filament_flow_ratio": [
         "0.98",
         "0.98"
@@ -35,8 +39,16 @@
         "nil"
     ],
     "filament_max_volumetric_speed": [
-        "24",
-        "24"
+        "30",
+        "40"
+    ],
+    "filament_pre_cooling_temperature": [
+        "0",
+        "0"
+    ],
+    "filament_ramming_travel_time": [
+        "0",
+        "0"
     ],
     "filament_ramming_volumetric_speed": [
         "-1",
@@ -86,10 +98,6 @@
         "nil",
         "nil"
     ],
-    "filament_extruder_variant": [
-        "Direct Drive Standard",
-        "Direct Drive High Flow"
-    ],
     "long_retractions_when_ec": [
         "1",
         "1"
diff --git a/resources/profiles/BBL/filament/Bambu PLA Basic @BBL H2D.json b/resources/profiles/BBL/filament/Bambu PLA Basic @BBL H2D.json
index 49970b3ccb..6df98f3daf 100644
--- a/resources/profiles/BBL/filament/Bambu PLA Basic @BBL H2D.json	
+++ b/resources/profiles/BBL/filament/Bambu PLA Basic @BBL H2D.json	
@@ -18,6 +18,10 @@
         "nil",
         "nil"
     ],
+    "filament_extruder_variant": [
+        "Direct Drive Standard",
+        "Direct Drive High Flow"
+    ],
     "filament_flow_ratio": [
         "0.98",
         "0.98"
@@ -35,8 +39,16 @@
         "nil"
     ],
     "filament_max_volumetric_speed": [
-        "24",
-        "40"
+        "25",
+        "35"
+    ],
+    "filament_pre_cooling_temperature": [
+        "0",
+        "0"
+    ],
+    "filament_ramming_travel_time": [
+        "0",
+        "0"
     ],
     "filament_ramming_volumetric_speed": [
         "-1",
@@ -86,10 +98,6 @@
         "nil",
         "nil"
     ],
-    "filament_extruder_variant": [
-        "Direct Drive Standard",
-        "Direct Drive High Flow"
-    ],
     "long_retractions_when_ec": [
         "1",
         "1"
diff --git a/resources/profiles/BBL/filament/Bambu PLA Matte @BBL H2D 0.8 nozzle.json b/resources/profiles/BBL/filament/Bambu PLA Matte @BBL H2D 0.8 nozzle.json
index dd23600837..96366c30a8 100644
--- a/resources/profiles/BBL/filament/Bambu PLA Matte @BBL H2D 0.8 nozzle.json	
+++ b/resources/profiles/BBL/filament/Bambu PLA Matte @BBL H2D 0.8 nozzle.json	
@@ -18,6 +18,10 @@
         "nil",
         "nil"
     ],
+    "filament_extruder_variant": [
+        "Direct Drive Standard",
+        "Direct Drive High Flow"
+    ],
     "filament_flow_ratio": [
         "0.98",
         "0.98"
@@ -35,8 +39,16 @@
         "nil"
     ],
     "filament_max_volumetric_speed": [
-        "28",
-        "28"
+        "30",
+        "40"
+    ],
+    "filament_pre_cooling_temperature": [
+        "0",
+        "0"
+    ],
+    "filament_ramming_travel_time": [
+        "0",
+        "0"
     ],
     "filament_ramming_volumetric_speed": [
         "-1",
@@ -86,10 +98,6 @@
         "nil",
         "nil"
     ],
-    "filament_extruder_variant": [
-        "Direct Drive Standard",
-        "Direct Drive High Flow"
-    ],
     "long_retractions_when_ec": [
         "1",
         "1"
diff --git a/resources/profiles/BBL/filament/Bambu PLA Matte @BBL H2D.json b/resources/profiles/BBL/filament/Bambu PLA Matte @BBL H2D.json
index 87f9fcd72d..6cae02fa80 100644
--- a/resources/profiles/BBL/filament/Bambu PLA Matte @BBL H2D.json	
+++ b/resources/profiles/BBL/filament/Bambu PLA Matte @BBL H2D.json	
@@ -18,6 +18,10 @@
         "nil",
         "nil"
     ],
+    "filament_extruder_variant": [
+        "Direct Drive Standard",
+        "Direct Drive High Flow"
+    ],
     "filament_flow_ratio": [
         "0.98",
         "0.98"
@@ -35,8 +39,16 @@
         "nil"
     ],
     "filament_max_volumetric_speed": [
-        "28",
-        "48"
+        "25",
+        "35"
+    ],
+    "filament_pre_cooling_temperature": [
+        "0",
+        "0"
+    ],
+    "filament_ramming_travel_time": [
+        "0",
+        "0"
     ],
     "filament_ramming_volumetric_speed": [
         "-1",
@@ -86,10 +98,6 @@
         "nil",
         "nil"
     ],
-    "filament_extruder_variant": [
-        "Direct Drive Standard",
-        "Direct Drive High Flow"
-    ],
     "long_retractions_when_ec": [
         "1",
         "1"