diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 38b0a8f..0e49bdd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ env:
 jobs:
   build_push_aurora:
     name: Build and publish SB image with ZFS
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     permissions:
       contents: read
diff --git a/build.sh b/build.sh
index 11912f2..f146357 100755
--- a/build.sh
+++ b/build.sh
@@ -24,35 +24,6 @@ ADDPKGS=(
 ## Add gregw/extras COPR
 curl -so /etc/yum.repos.d/gregw-extras-fedora-40.repo https://copr.fedorainfracloud.org/coprs/gregw/extras/repo/fedora-40/gregw-extras-fedora-40.repo
 
-## Add systemd timers for periodic ZFS scrubs
-cat << EOF > /usr/lib/systemd/zfs-scrub@.service
-[Unit]
-Description=zpool scrub on %i
-
-[Service]
-Nice=19
-IOSchedulingClass=idle
-KillSignal=SIGINT
-ExecStart=/usr/sbin/zpool scrub %i
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-cat << EOF > /usr/lib//systemd/system/zfs-scrub@.timer
-[Unit]
-Description=Weekly zpool scrub on %i
-
-[Timer]
-OnCalendar=Mon *-*-* 04:00:00
-AccuracySec=1h
-Persistent=true
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-
 RMSTRING=""
 ADDSTRING=""