diff --git a/server/knot-gpgv-import b/server/knot-gpgv-import
index b30c168..826c416 100644
--- a/server/knot-gpgv-import
+++ b/server/knot-gpgv-import
@@ -5,16 +5,16 @@ set -eu
 file="$1"
 
 case "$file" in
-	# We don't control the order of the zone/sig upload so just try on both
-	*.zone) ;;
 	*.zone.sig) ;;
 
 	# Ignore everything else
 	*) exit 0 ;;
 esac
 
+zone=${file%*.sig}
+
 [ -f "$file" ] || exit 1
-[ -f "$file".sig ] || exit 2
-gpgv --keyring $HOME/trustedkeys.kbx "$file".sig "$file" || exit 3
-cp -t /var/lib/knot "$file" || exit 4
-sudo -u knot knotc zone-reload "$(basename "${file%*.zone*}")"
+[ -f "$zone" ] || exit 2
+gpgv --keyring $HOME/trustedkeys.kbx "$file" "$zone" || exit 3
+cp -t /var/lib/knot "$zone" || exit 4
+sudo -u knot knotc zone-reload "$(basename "${zone%*.zone*}")"