diff --git a/_machines/hera-tasks.yml b/_machines/hera-tasks.yml
index df7f54a..ad3c52e 100644
--- a/_machines/hera-tasks.yml
+++ b/_machines/hera-tasks.yml
@@ -35,7 +35,10 @@
               exit 0
           fi
 
-          pacman --sync --refresh --sysupgrade --noprogressbar --noconfirm
+          # Make sure that keys are up to date, otherwise sig checks may fail
+          pacman --sync --noprogressbar --noconfirm --refresh --needed archlinux-keyring
+
+          pacman --sync --noprogressbar --noconfirm --sysupgrade
 
     - name: Install pacman autoupdate service
       ansible.builtin.copy:
diff --git a/maintenance.sh b/maintenance.sh
index 903c41f..d79df05 100755
--- a/maintenance.sh
+++ b/maintenance.sh
@@ -3,7 +3,7 @@
 set -o nounset
 set -o errexit
 
-sudo pacman -Syu
+sudo bash -c "pacman -Sy --needed archlinux-keyring && pacman -Syu"
 
 ./update-aur-pkgs.sh