diff --git a/config/client_macros.cfg b/config/client_macros.cfg
index a718ff4..3981864 100755
--- a/config/client_macros.cfg
+++ b/config/client_macros.cfg
@@ -1,8 +1,7 @@
-
 [gcode_macro START_PRINT]
-variable_parameter_T_BED: 60
-variable_parameter_T_EXTRUDER: 215
 gcode:
+    {% set T_BED = params.T_BED|default(60) %}
+    {% set T_EXTRUDER = params.T_EXTRUDER|default(215) %}
 
     M83
     # Use absolute coordinates but realative extrusions
@@ -65,11 +64,12 @@ gcode:
 
 [gcode_macro PAUSE]
 rename_existing: BASE_PAUSE
-default_parameter_X: 5    #edit to your pause position
-default_parameter_Y: 5    #edit to your pause position
-default_parameter_Z: 10     #edit to your pause position
-default_parameter_E: 5      #edit to your retract length
 gcode:
+    {% set X = params.X|default(5) %}
+    {% set Y = params.Y|default(5) %}
+    {% set Z = params.Z|default(10) %}
+    {% set E = params.E|default(5) %}
+
     SAVE_GCODE_STATE NAME=PAUSE_state
     BASE_PAUSE
     G91
@@ -80,11 +80,12 @@ gcode:
 
 [gcode_macro CLEAR_PAUSE]
 rename_existing: BASE_CLEAR_PAUSE
-default_parameter_X: 5    #edit to your clear pause position
-default_parameter_Y: 205    #edit to your clear pause position
-default_parameter_Z: 10     #edit to your clear pause position
-default_parameter_E: 5      #edit to your retract length
 gcode:
+    {% set X = params.X|default(5) %}
+    {% set Y = params.Y|default(205) %}
+    {% set Z = params.Z|default(10) %}
+    {% set E = params.E|default(5) %}
+
     SAVE_GCODE_STATE NAME=PAUSE_state
     BASE_PAUSE
     G91
@@ -95,8 +96,9 @@ gcode:
 
 [gcode_macro RESUME]
 rename_existing: BASE_RESUME
-default_parameter_E: 5      #edit to your retract length
 gcode:
+    {% set E = params.E|default(5) %}
+
     G91
     G1 E{E} F1900
     G90
@@ -133,8 +135,9 @@ gcode:
 # - If not, heat to setpoint.
 # - If no setpoint, heat to parameter T (default@200)
 [gcode_macro LOW_TEMP_CHECK]
-default_parameter_T: 215
 gcode: 
+    {% set T = params.T|default(215) %}
+
     {% if printer.extruder.target != 0 %} # if there is a setpoint for extruder
         {% if printer.extruder.temperature < printer.extruder.target %} # if not reached, heat
             M117 Heating from {printer.extruder.temperature} to {printer.extruder.target}.
@@ -209,9 +212,10 @@ gcode:
     M117 Printing..
 
 [gcode_macro COUNTDOWN]
-default_parameter_MSG: "Time:"
-default_parameter_TIME: 10
 gcode: 
+    {% set MSG = params.MSG|default(Time)|string %}
+    {% set TIME = params.TIME|default(10) %}
+
     # countdown 
     {% for s in range(TIME|int, 0, -1) %}
         # dwell 1 second
diff --git a/klipper/Dockerfile b/klipper/Dockerfile
index c32c703..265c646 100644
--- a/klipper/Dockerfile
+++ b/klipper/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9 as builder
+FROM python:3.10 as builder
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -36,7 +36,7 @@ RUN ${MOONRAKER_VENV_DIR}/bin/pip install wheel gpiod
 
 RUN ${MOONRAKER_VENV_DIR}/bin/pip install -r moonraker/scripts/moonraker-requirements.txt
 
-FROM python:3.9-slim as image
+FROM python:3.10-slim as image
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/klipper/builder.Dockerfile b/klipper/builder.Dockerfile
index e31c657..0a7f4a1 100644
--- a/klipper/builder.Dockerfile
+++ b/klipper/builder.Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9
+FROM python:3.10
 
 ARG DEBIAN_FRONTEND=noninteractive