diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index a0e107e..12e06b9 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -46,4 +46,4 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
-          tags: lrgex/klipper-docker:latest
+          tags: lrgex/klipper-docker:2.3
diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
index 3343ade..4b58ef4 100644
--- a/scripts/docker-entrypoint.sh
+++ b/scripts/docker-entrypoint.sh
@@ -17,7 +17,7 @@ EOF
 backarosa=$(grep -c "restore done" /opt/lrgex/flags)
 if [ ! $backarosa ]; then
     echo "Backuping klipper files..."
-    cp -r /home/lrgex/klipper/printer_data /tmp/klipper_printer_data
+    cp -r /home/lrgex /tmp/lrgex
 fi
 
 ##################### End Backarosa #####################
@@ -66,9 +66,10 @@ for package in "${packages_array[@]}"; do
     fi
 done
 
-if [ "${RESTORE}" = "true" ]; then
+if [ "${RESTORE}" = "true" ] && [ ! $backarosa ]; then
     echo "Restoring klipper files..."
-    cp -r /tmp/klipper_printer_data /home/lrgex/klipper/printer_data
+    cp -r /tmp/lrgex /home/lrgex
+    rm -rf /tmp/lrgex
     echo "restore done" >> /opt/lrgex/flags
 fi