diff --git a/stack.sh b/stack.sh
index ead56e6..b5dc0ee 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1069,7 +1069,7 @@
 
 # Write a clouds.yaml file and use the devstack-admin cloud
 write_clouds_yaml
-export OS_CLOUD=devstack-admin
+export OS_CLOUD=${OS_CLOUD:-devstack-admin}
 
 if is_service_enabled keystone; then
     echo_summary "Starting Keystone"