diff --git a/devstack/settings b/devstack/settings
index e4333d5ae..28f779df1 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -17,7 +17,7 @@ TOBIKO_LOG_FILE=${TOBIKO_LOG_FILE:-tobiko.log}
 TOBIKO_GLANCE_IMAGE_DIR=${TOBIKO_GLANCE_IMAGE_DIR:-}
 
 # --- Cirros image settings ---
-TOBIKO_CIRROS_IMAGE_NAME=${TOBIKO_CIRROS_IMAGE_NAME:-${DEFAULT_IMAGE_NAME}}
+TOBIKO_CIRROS_IMAGE_NAME=${TOBIKO_CIRROS_IMAGE_NAME:-}
 TOBIKO_CIRROS_IMAGE_URL=${TOBIKO_CIRROS_IMAGE_URL:-}
 TOBIKO_CIRROS_IMAGE_FILE=${TOBIKO_CIRROS_IMAGE_FILE:-}
 TOBIKO_CIRROS_USERNAME=${TOBIKO_CIRROS_USERNAME:-}