diff --git a/config/client_macros.cfg b/config/client_macros.cfg
index cc92b0d..f32b387 100755
--- a/config/client_macros.cfg
+++ b/config/client_macros.cfg
@@ -111,6 +111,12 @@ gcode:
     SDCARD_RESET_FILE
     BASE_CANCEL_PRINT
 
+[gcode_macro MAINTENANCE]
+gcode:
+    SAVE_GCODE_STATE NAME=PAUSE_state
+    G1 X110 Y5 Z66.5 F600
+    M84
+
 # Park toolhead
 [gcode_macro M125]
 gcode:
@@ -142,8 +148,13 @@ gcode:
     {% endif %}
     
 
-# load filament
+# load filament alias
 [gcode_macro M701]
+gcode:
+    LOAD_FILAMENT
+
+# load filament
+[gcode_macro LOAD_FILAMENT]
 gcode:
     SAVE_GCODE_STATE NAME=loading_filament
     M117 Loading Filament
@@ -155,12 +166,17 @@ gcode:
     G1 E25 F120  # some extra to prime the nozzle --> slower 
     G92 E0.0
     RESTORE_GCODE_STATE NAME=loading_filament
-    
-# unload filament
+
+
+# unload filament alias
 [gcode_macro M702]
+gcode:
+    UNLOAD_FILAMENT
+
+# unload filament
+[gcode_macro UNLOAD_FILAMENT]
 gcode:
     SAVE_GCODE_STATE NAME=unloading_filament
-    M125 # park
     M117 Unloading Filament 
     LOW_TEMP_CHECK
     G91 # set relative
@@ -181,11 +197,11 @@ gcode:
     G91 # relative
     G1 E-1 F300 # retract 1
     M125 # park
-    M702 # unload
+    UNLOAD_FILAMENT # unload
 
     M117 New filament
     COUNTDOWN TIME=25 MSG="Switch"
-    M701
+    LOAD_FILAMENT
     COUNTDOWN TIME=10 MSG="Clean"
     BASE_RESUME
     M117 Resuming
diff --git a/klipper/Dockerfile b/klipper/Dockerfile
index 67d5652..413809a 100644
--- a/klipper/Dockerfile
+++ b/klipper/Dockerfile
@@ -69,7 +69,7 @@ ENV MOONRAKER_VENV_DIR=${HOME}/moonraker-env
 ARG DEVICE_GROUP=device
 ARG DEVICE_GID=987
 
-RUN useradd --user-group --no-log-init --shell /bin/false ${USER} && \
+RUN useradd --user-group --no-log-init --shell /bin/false -m -d ${HOME} ${USER} && \
     groupadd -g ${DEVICE_GID} ${DEVICE_GROUP} && \
     usermod -a -G ${DEVICE_GROUP} ${USER} && \
     usermod -a -G tty ${USER} && \
@@ -81,8 +81,8 @@ RUN useradd --user-group --no-log-init --shell /bin/false ${USER} && \
 USER ${USER}
 WORKDIR ${HOME}
 
-RUN mkdir ${HOME}/gcode_files && \
-    mkdir ${CONFIG_DIR} && \
+RUN mkdir -p ${HOME}/gcode_files && \
+    mkdir -p ${CONFIG_DIR} && \
     touch ${HOME}/.moonraker_api_key
 VOLUME ${HOME}/gcode_files
 VOLUME ${CONFIG_DIR}