diff --git a/backup.sh b/backup.sh
deleted file mode 100644
index 81ad1e5..0000000
--- a/backup.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-time=$(date +"%Y-%m-%dT%H:%M:%S%z")
-dir=backup
-[ -d "${dir}" ] || mkdir -p "${dir}"
-docker compose run --rm -u postgres inventree-db sh -c 'PGPASSWORD=$POSTGRES_PASSWORD pg_dump -h inventree-db -p 5432 -U $POSTGRES_USER inventree' > "${dir}/${time}.sql"
-# to restore: pg_restore -d newdb db.dump
diff --git a/scripts/backup.sh b/scripts/backup.sh
new file mode 100755
index 0000000..46f3128
--- /dev/null
+++ b/scripts/backup.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# Immediatly exit on command failure (e)
+# and quit on unset variables (u)
+set -ue
+
+export BACKUP_REPO=ssh://backup_selfnet/media/backupstorage/inventree
+export BACKUP_NAME_DB="db_$(date -u +'%Y-%m-%dT%H:%M%Z')"
+export BACKUP_NAME_DATA="data_$(date -u +'%Y-%m-%dT%H:%M%Z')"
+export BACKUP_NAME_CONF="config_$(date -u +'%Y-%m-%dT%H:%M%Z')"
+export BORG_PASSPHRASE=$(cat ~/.borg_pass)
+
+echo "Backup InvenTree data folder"
+/usr/bin/borg create --compression zstd --stats ${BACKUP_REPO}::${BACKUP_NAME_DATA} ${INVENTREE_DEPLOYMENT_DIR}/data
+
+echo "Backup InvenTree config"
+/usr/bin/borg create --compression zstd --stats ${BACKUP_REPO}::${BACKUP_NAME_CONF} ${INVENTREE_DEPLOYMENT_DIR}/.env
+
+# Dump the database into borg create
+echo "Starting backup of database..."
+docker exec inventree-db pg_dump '$POSTGRES_DB' -U '$POSTGRES_USER' |
+    /usr/bin/borg create --compression zstd --stats ${BACKUP_REPO}::${BACKUP_NAME_DB} -
+
+echo "Backup done. Pruning backup-repo..."
+/usr/bin/borg prune -v --list --keep-daily=7 --keep-weekly=7 --keep-monthly=10 --keep-yearly=5 ${BACKUP_REPO}
+
+echo "Done"
diff --git a/systemd/inventree-backup.service b/systemd/inventree-backup.service
new file mode 100644
index 0000000..d431102
--- /dev/null
+++ b/systemd/inventree-backup.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=InvenTree borg backup
+
+[Service]
+Type=oneshot
+Environment="INVENTREE_DEPLOYMENT_DIR=/home/inventree/inventree-deployment"
+ExecStart=${INVENTREE_DEPLOYMENT_DIR}/scripts/backup.sh
+
diff --git a/systemd/inventree-backup.timer b/systemd/inventree-backup.timer
new file mode 100644
index 0000000..08a3593
--- /dev/null
+++ b/systemd/inventree-backup.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Run daily InvenTree Backup
+
+[Timer]
+OnCalendar=*-*-* 03:30:00
+Persistent=true
+
+[Install]
+WantedBy=timers.target