diff --git a/buildman/templates/cloudconfig.yaml b/buildman/templates/cloudconfig.yaml
index 7c74b28fa..ac3d376e5 100644
--- a/buildman/templates/cloudconfig.yaml
+++ b/buildman/templates/cloudconfig.yaml
@@ -34,6 +34,10 @@ coreos:
     group: {{ coreos_channel }}
 
   units:
+    - name: update-engine.service
+      command: stop
+    - name: locksmithd.service
+      command: stop
     - name: systemd-journal-gatewayd.socket
       command: start
       enable: yes