diff --git a/.gitignore b/.gitignore
index e1390fd..ea0f5de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,11 +4,11 @@
 client_software/.sync_*.db
 client_software/setup_system.conf
 config/setup_system.conf
-config/setup_system.conf.bak
+config/*.bak
 config/skel.tar.zst
 config/.sync_*.db
-config/.sync_*.db
 config.d/*.conf
 config.d/*.sys
+config.d/*.bak
 ks_pc_prof/*
 ks.cfg
diff --git a/system_setup/sync_client_software.sh b/system_setup/sync_client_software.sh
index bc19f3f..7a44ed1 100755
--- a/system_setup/sync_client_software.sh
+++ b/system_setup/sync_client_software.sh
@@ -51,8 +51,8 @@ if [[ ! -z "${REPO_URL}" ]]; then
         else
             # Doing upgrade, discarding all local changes frist (is more save than forced pull)
             echo "Checks have passed, we are now upgrading via git."
-            #Fetch latest Updates and remove all history
-            git fetch origin && git reset --hard origin/${REPO_BRANCH} && git rebase HEAD^
+            #Fetch latest commit only (depth=1), reset working tree, purge old history and untracked files
+            git fetch --depth=1 origin ${REPO_BRANCH} && git reset --hard FETCH_HEAD && git -C "${SYSCONFIGPATH}" clean -fd && git gc --prune=now --quiet
             if [[ $? -ne 0 ]]; then
                 echo "Error: Failure while updating, will continue as is."
             fi