diff --git a/tobiko/openstack/stacks/_cirros.py b/tobiko/openstack/stacks/_cirros.py
index 6f2a539d2..8f1793815 100644
--- a/tobiko/openstack/stacks/_cirros.py
+++ b/tobiko/openstack/stacks/_cirros.py
@@ -22,7 +22,7 @@ from tobiko.shell import sh
 
 CONF = config.CONF
 
-CIRROS_IMAGE_VERSION = '0.4.0'
+CIRROS_IMAGE_VERSION = '0.5.1'
 
 CIRROS_IMAGE_URL = (
     'http://download.cirros-cloud.net/{version}/'
@@ -35,9 +35,9 @@ class CirrosImageFixture(glance.URLGlanceImageFixture):
     image_name = CONF.tobiko.cirros.image_name
     image_file = CONF.tobiko.cirros.image_file
     container_format = CONF.tobiko.cirros.container_format or "bare"
-    disk_format = CONF.tobiko.cirros.disk_format or "raw"
+    disk_format = CONF.tobiko.cirros.disk_format or "qcow2"
     username = CONF.tobiko.cirros.username or 'cirros'
-    password = CONF.tobiko.cirros.password or 'cubswin:)'
+    password = CONF.tobiko.cirros.password or 'gocubsgo'
 
 
 class CirrosFlavorStackFixture(_nova.FlavorStackFixture):