diff --git a/bootstrap.sh b/bootstrap.sh
index b5c3bb4..fbf39fd 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -213,6 +213,7 @@ cp systemd/server-backup.* /etc/systemd/system/
 cp systemd/freshrss-fav-archiver.* /etc/systemd/system/
 systemctl daemon-reload
 systemctl enable --now server-backup.timer
+systemctl enable --now update-server.timer
 systemctl enable --now freshrss-fav-archiver.timer
 
 ###############################################################################
diff --git a/scripts/update.sh b/scripts/update.sh
index 35a6f1a..9ff2c7d 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -1,8 +1,12 @@
 #!/usr/bin/env bash
 set -e
 
-cd "$(dirname "$0")/.."
+apt update -y
+apt upgrade -y
 
+cd /home/tomasr/vps-config
+
+docker compose down
 docker compose pull
 docker compose up -d
 docker image prune -f
diff --git a/systemd/server-backup.timer b/systemd/server-backup.timer
index efcfe3b..3b6312d 100644
--- a/systemd/server-backup.timer
+++ b/systemd/server-backup.timer
@@ -2,7 +2,7 @@
 Description=Run nightly server rsync backup
 
 [Timer]
-OnCalendar=*-*-* 02:00:00
+OnCalendar=*-*-* 00:00:00
 Persistent=true
 
 [Install]
diff --git a/systemd/update-server.service b/systemd/update-server.service
new file mode 100644
index 0000000..8d71e30
--- /dev/null
+++ b/systemd/update-server.service
@@ -0,0 +1,7 @@
+[Unit]
+Descript=Nightly update of the server apt packages and docker images. Also restart all the docker images.
+After=local-fs.target
+
+[Service]
+Type=oneshot
+ExecStart=/home/tomasr/vps-config/scripts/update.sh
diff --git a/systemd/update-server.timer b/systemd/update-server.timer
new file mode 100644
index 0000000..815b3b1
--- /dev/null
+++ b/systemd/update-server.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Run nightly server update
+
+[Timer]
+OnCalendar=*-*-* 02:00:00
+Persistent=true
+
+[Install]
+WantedBy=timers.target