diff --git a/tools/init-runonce b/tools/init-runonce
index 868863717b81fde32c075504a658c591ad167ab3..607f1835044e83986f152be8a417c386136fce0b 100755
--- a/tools/init-runonce
+++ b/tools/init-runonce
@@ -5,8 +5,9 @@
 # configures networking and nova quotas to allow 40 m1.small instances
 # to be created.
 
-IMAGE_URL=http://download.cirros-cloud.net/0.3.5/
-IMAGE=cirros-0.3.5-x86_64-disk.img
+ARCH=$(uname -m)
+IMAGE_URL=http://download.cirros-cloud.net/0.4.0/
+IMAGE=cirros-0.4.0-${ARCH}-disk.img
 IMAGE_NAME=cirros
 IMAGE_TYPE=linux