diff --git a/buildman/templates/cloudconfig.yaml b/buildman/templates/cloudconfig.yaml
index fc8ec6a4f..321e75927 100644
--- a/buildman/templates/cloudconfig.yaml
+++ b/buildman/templates/cloudconfig.yaml
@@ -31,8 +31,8 @@ coreos:
         [Service]
         TimeoutStartSec=600
         TimeoutStopSec=2000
-        ExecStartPre=/usr/bin/sudo /bin/sh -xc "echo '{{ manager_ip }} buildman.quay.io' >> /etc/hosts; exit 0"
+        ExecStartPre=/bin/sh -xc "echo '{{ manager_ip }} buildman.quay.io' >> /etc/hosts; exit 0"
         ExecStartPre=/usr/bin/docker login -u {{ quay_username }} -p {{ quay_password }} -e unused quay.io
         ExecStart=/usr/bin/docker run --rm --net=host --name quay-builder --privileged --env-file /root/overrides.list -v /var/run/docker.sock:/var/run/docker.sock quay.io/coreos/registry-build-worker:latest
         ExecStop=/usr/bin/docker stop quay-builder
-        ExecStopPost=/usr/bin/sudo /bin/sh -xc "/bin/sleep 600; /sbin/shutdown -h now"
+        ExecStopPost=/bin/sh -xc "/bin/sleep 600; /usr/bin/systemctl --no-block poweroff"