diff --git a/upgrade/upgrade-scripts/common.sh b/upgrade/upgrade-scripts/common.sh
index c52058eb..12b2c2d0 100644
--- a/upgrade/upgrade-scripts/common.sh
+++ b/upgrade/upgrade-scripts/common.sh
@@ -381,7 +381,7 @@ function mask_service() {
 		chroot "/var/lib/machines/$container" systemctl mask "$svc" ||
 			die "failed to mask '$svc' in container '$container'"
 	else
-		systemctl mask "$svc" || die "failed to mask '$svc'"
+		systemctl mask --now "$svc" || die "failed to mask '$svc'"
 	fi
 }
 
@@ -483,5 +483,6 @@ function fix_and_migrate_services() {
 		snmpd.service
 		systemd-timesyncd.service
 		td-agent.service
+		telegraf.service
 	EOF
 }