diff --git a/development/download-backups.sh b/development/download-backups.sh
index c7915d1f..62811f2d 100644
--- a/development/download-backups.sh
+++ b/development/download-backups.sh
@@ -14,6 +14,44 @@ LIVE_PATH="/var/lib/docker/volumes/frappe-deployment_sites/_data/${SITE_NAME}/pr
 # Load environment variables from .env file
 source .env
 
+# Function to download only the latest backup set (files with the same timestamp prefix)
+# Args: $1 = backup path, $2 = "true" if path is inside container, "false" if on host
+download_latest_backup_set() {
+    local BACKUP_PATH="$1"
+    local IS_CONTAINER="$2"
+
+    if [ "$IS_CONTAINER" = "true" ]; then
+        # Get latest prefix from inside container
+        LATEST_PREFIX=$(sshpass -p "$HETZNER_SSH_PASSWORD" ssh "$SERVER" "docker exec frappe-deployment-backend-1 sh -c \"ls -t ${BACKUP_PATH}/ 2>/dev/null | head -1 | cut -d'-' -f1\"")
+    else
+        # Get latest prefix from host filesystem
+        LATEST_PREFIX=$(sshpass -p "$HETZNER_SSH_PASSWORD" ssh "$SERVER" "ls -t ${BACKUP_PATH}/ 2>/dev/null | head -1 | cut -d'-' -f1")
+    fi
+
+    if [ -z "$LATEST_PREFIX" ]; then
+        echo "Error: No backup files found in ${BACKUP_PATH}."
+        return 1
+    fi
+
+    echo "Found latest backup set: ${LATEST_PREFIX}"
+
+    TEMP_DIR="/tmp/backup_${SITE_NAME}"
+    mkdir -p ./development/backups
+
+    if [ "$IS_CONTAINER" = "true" ]; then
+        # Copy from container: use tar to stream only matching files
+        sshpass -p "$HETZNER_SSH_PASSWORD" ssh "$SERVER" "rm -rf ${TEMP_DIR} && mkdir -p ${TEMP_DIR} && docker exec frappe-deployment-backend-1 sh -c 'cd ${BACKUP_PATH} && tar cf - ${LATEST_PREFIX}*' | tar xf - -C ${TEMP_DIR}"
+    else
+        # Copy from host: copy only matching files to temp dir
+        sshpass -p "$HETZNER_SSH_PASSWORD" ssh "$SERVER" "rm -rf ${TEMP_DIR} && mkdir -p ${TEMP_DIR} && cp ${BACKUP_PATH}/${LATEST_PREFIX}* ${TEMP_DIR}/"
+    fi
+
+    sshpass -p "$HETZNER_SSH_PASSWORD" scp "${SERVER}:${TEMP_DIR}/"* ./development/backups/
+    sshpass -p "$HETZNER_SSH_PASSWORD" ssh "$SERVER" "rm -rf ${TEMP_DIR}"
+
+    echo "Download complete."
+}
+
 # Function to download from archived location
 download_from_archive() {
     echo "Checking archived location..."
@@ -30,14 +68,7 @@ download_from_archive() {
         # Check if backup directory exists in the archived site
         if sshpass -p "$HETZNER_SSH_PASSWORD" ssh "$SERVER" "docker exec frappe-deployment-backend-1 test -d '${ARCHIVED_BACKUP_PATH}'"; then
             echo "Downloading from archived location..."
-
-            # Copy from container to host temp location, then scp to local
-            TEMP_DIR="/tmp/backup_${SITE_NAME}"
-            sshpass -p "$HETZNER_SSH_PASSWORD" ssh "$SERVER" "rm -rf ${TEMP_DIR} && docker cp frappe-deployment-backend-1:${ARCHIVED_BACKUP_PATH} ${TEMP_DIR}"
-            sshpass -p "$HETZNER_SSH_PASSWORD" scp -r "${SERVER}:${TEMP_DIR}" ./development/backups
-            sshpass -p "$HETZNER_SSH_PASSWORD" ssh "$SERVER" "rm -rf ${TEMP_DIR}"
-
-            echo "Download complete."
+            download_latest_backup_set "$ARCHIVED_BACKUP_PATH" "true"
         else
             echo "Error: Backup directory not found in archived site ${LATEST_ARCHIVED}."
             exit 1
@@ -54,8 +85,7 @@ if sshpass -p "$HETZNER_SSH_PASSWORD" ssh "$SERVER" "[ -d '$LIVE_PATH' ]"; then
     # Check if backup directory has files
     if sshpass -p "$HETZNER_SSH_PASSWORD" ssh "$SERVER" "[ -n \"\$(ls -A '$LIVE_PATH' 2>/dev/null)\" ]"; then
         echo "Site is live with backup files. Downloading from live location..."
-        sshpass -p "$HETZNER_SSH_PASSWORD" scp -r "${SERVER}:${LIVE_PATH}" ./development
-        echo "Download complete."
+        download_latest_backup_set "$LIVE_PATH" "false"
     else
         echo "Site is live but has no backup files."
         download_from_archive