diff --git a/roles/gitea/templates/gitea_backup.sh.j2 b/roles/gitea/templates/gitea_backup.sh.j2
index 05e9738..8949257 100644
--- a/roles/gitea/templates/gitea_backup.sh.j2
+++ b/roles/gitea/templates/gitea_backup.sh.j2
@@ -10,6 +10,7 @@ IFS="$(printf '\n\t')"
 PROGRAM="${0##*/}"
 INSTALL_DIR=/usr/local/bin
 TMP_DIR=/home/git/tmp
+WORK_DIR=/var/lib/gitea/
 DATA_DIR=/var/lib/gitea/data/
 LOG_DIR=/var/lib/gitea/log/
 REPO_DIR=/home/git/gitea-repositories/
@@ -50,7 +51,7 @@ do_backup() {
   stop_service
   output_dump_file="$DUMP_DIR/gitea-dump-$(date +'%Y%m%d').zip"
   cd "$INSTALL_DIR" || exit 1
-  ./gitea dump -V -f "$output_dump_file" -c "$CONFIG_FILE" -t "$TMP_DIR" --skip-attachment-data --skip-lfs-data -w "$HOME"
+  ./gitea dump -V -f "$output_dump_file" -c "$CONFIG_FILE" -t "$TMP_DIR" --skip-attachment-data --skip-lfs-data -w "$WORK_DIR"
   chmod 640 "$output_dump_file" # Make the file readable by group for scp to different host by different user
   restart_service
   echo "Done."
@@ -63,14 +64,13 @@ do_restore() {
   chmod 600 "$zip_file" # Backup has changed permissions, restore them here
   echo "Unzipping $zip_file..." && unzip "$zip_file" -d "$zip_dir" && echo "  OK."
   cd "$zip_dir" || exit 1
-  chmod 660 "$CONFIG_FILE"
   echo -n "Restoring $CONFIG_FILE..." && mv -f app.ini "$CONFIG_FILE" && echo "  OK."
-  chmod 640 "$CONFIG_FILE"
-  echo -n "Restoring $DATA_DIR..." && mv -f data/* "$DATA_DIR" && echo "  OK."
-  echo -n "Restoring $LOG_DIR..." && mv -f log/* "$LOG_DIR" && echo "  OK."
-  echo -n "Restoring $REPO_DIR..." && mkdir -p "$REPO_DIR" && mv -f repos/* "$REPO_DIR" && echo "  OK."
+  echo -n "Restoring $DATA_DIR..." && mv -f data/* "$DATA_DIR" && rmdir data && echo "  OK."
+  echo -n "Restoring $LOG_DIR..." && mv -f log/* "$LOG_DIR" && rmdir log && echo "  OK."
+  echo -n "Restoring $REPO_DIR..." && mkdir -p "$REPO_DIR" && mv -f repos/* "$REPO_DIR" && rmdir repos && echo "  OK."
   echo -n "Changing ownership..." && chown -R git:git "$CONFIG_FILE" /var/lib/gitea && echo "  OK."
-  echo -n "Restoring MySQL database..." && mysql --default-character-set=utf8mb4 -u"$MYSQL_USER" -p"$MYSQL_PW" "$MYSQL_DB" < gitea-db.sql && echo "  OK."
+  echo -n "Restoring MySQL database..." && mysql --default-character-set=utf8mb4 -u"$MYSQL_USER" -p"$MYSQL_PW" "$MYSQL_DB" < gitea-db.sql && rm gitea-db.sql && echo "  OK."
+  rmdir "$zip_dir"
   restart_service
   regenerate_hooks
   echo "Done."