diff --git a/cloud-image/create_image.py b/cloud-image/create_image.py
index d980a2ba..b7b1fec1 100644
--- a/cloud-image/create_image.py
+++ b/cloud-image/create_image.py
@@ -101,8 +101,9 @@ def main():
                                startup_script)
     passwd = uuid.uuid4().hex
     instance.change_password(passwd)
-    # wait for the password change to be processed
-    sleep(POLL_SEC)
+    # wait for the password change to be processed.  Continuing while
+    # a password change is processing will cause image creation to fail.
+    sleep(POLL_SEC*6)
 
     env.host_string = str(instance.accessIPv4)
     env.user = "root"