diff --git a/README.md b/README.md
index f15912e..d042554 100644
--- a/README.md
+++ b/README.md
@@ -160,10 +160,10 @@ You will be pasting/typing these commands into the Mainsail/Fluidd console.
 2. Do a mechanical gantry calibration; `G34`. After the controlled collision against the beam at the top, there will be a 10 second pause for you to verify that both sides of the gantry are pressed up against the `stoppers` at the top. You will hear a succession of beeps.
    1. Figure out your `Z` `position_max` by baby stepping your way up to the beam, and adjust `position_max`, if necessary.
 3. PID tune the bed. Ideally, all PID tuning should occur at the temperatures that you print most at.
-   1. `PID_TEST_BED`
+   1. `PID_TEST_BED TEMP=70`
    2. `SAVE_CONFIG` (once completed)
 4. PID tune the extruder while part cooling fan runs at 25%.
-   1. `PID_TEST_HOTEND`
+   1. `PID_TEST_HOTEND TEMP=245`
    2. `SAVE_CONFIG` (once completed)
 5. Adjust `z_offset`. Make sure your nozzle if very clean. Do the [Paper test](https://www.klipper3d.org/Bed_Level.html?h=probe_calibrate#the-paper-test).
    1. `DO_PROBE_CALIBRATE`
diff --git a/cfgs/CALIBRATION.cfg b/cfgs/CALIBRATION.cfg
index 73895c7..468c704 100644
--- a/cfgs/CALIBRATION.cfg
+++ b/cfgs/CALIBRATION.cfg
@@ -1,21 +1,27 @@
 [gcode_macro PID_TEST_BED]
 gcode:
+    # Parameters
+    {% set TARGETTEMP = params.TEMP|default(70)|int %}
+    
     {% set max_x = printer.configfile.config["stepper_x"]["position_max"]|float %}
     {% set max_y = printer.configfile.config["stepper_y"]["position_max"]|float %}
     G28
     G90
     G1 X{max_x/2} Y{max_y/2} Z40 F6000
-    PID_CALIBRATE HEATER=heater_bed TARGET=70
+    PID_CALIBRATE HEATER=heater_bed TARGET={TARGETTEMP}
 
 [gcode_macro PID_TEST_HOTEND]
 gcode:
+    # Parameters
+    {% set TARGETTEMP = params.TEMP|default(245)|int %}
+    
     {% set max_x = printer.configfile.config["stepper_x"]["position_max"]|float %}
     {% set max_y = printer.configfile.config["stepper_y"]["position_max"]|float %}
     G28
     G90
     G1 X{max_x/2} Y{max_y/2} Z10 F6000
     M106 S64
-    PID_CALIBRATE HEATER=extruder TARGET=245
+    PID_CALIBRATE HEATER=extruder TARGET={TARGETTEMP}
 
 # TODO test this
 [gcode_macro PID_TEST_ALL]