Fix disable and stop command

1 files changed, 1 insertions, 1 deletions

diff --git a/buildkite-agent-bin.install b/buildkite-agent-bin.install
index 7d5d834ff30e..6b12e4e46101 100755
--- a/buildkite-agent-bin.install
+++ b/buildkite-agent-bin.install
@@ -16,5 +16,5 @@ post_upgrade() {
 
 pre_remove() {
   echo "Stopping and disabling any buildkite-agent systemd services"
-  systemctl disable --now buildkite-agent.service 'buildkite-agent@*.service'
+  systemctl list-units --plain --no-legend --all | awk '{print $1}' | grep '^buildkite-agent' | xargs -I {} systemctl disable --now {} || true
 }