diff --git a/.gitea/workflows/build-test-deploy.yaml b/.gitea/workflows/build-test-deploy.yaml
index 4950b88..3e98019 100644
--- a/.gitea/workflows/build-test-deploy.yaml
+++ b/.gitea/workflows/build-test-deploy.yaml
@@ -104,11 +104,11 @@ jobs:
           fi
           DATE="$(date "+%Y%m%d")"
 
-          if [[ "$SERIAL_OLD" == "$DATE*" ]]
+          if [[ "$SERIAL_OLD" -lt "${DATE}01" ]]
           then
-            SERIAL_NEW="$((SERIAL+1))"
-          else
             SERIAL_NEW="${DATE}01"
+          else
+            SERIAL_NEW="$((SERIAL_OLD+1))"
           fi
           echo "$SERIAL_NEW" > /tmp/serial_new
 
@@ -156,7 +156,7 @@ jobs:
 
       - name: Verifying operation
         run: |
-          SERIAL_ACTIVE="$(dig "@${{ vars.SSH_HOST }}" SOA pvv.ntnu.no | cut -d" " -f3)"
+          SERIAL_ACTIVE="$(dig +short "@${{ vars.SSH_HOST }}" SOA pvv.ntnu.no | cut -d" " -f3)"
           if [[ "$(cat /tmp/serial_new)" == "$SERIAL_ACTIVE" ]]
           then
             echo "Update successful, server reports new active serial number '$SERIAL_ACTIVE'"