diff --git a/scripts/bootstrap-aio.sh b/scripts/bootstrap-aio.sh
index 50561cc1a4..fd221c0652 100755
--- a/scripts/bootstrap-aio.sh
+++ b/scripts/bootstrap-aio.sh
@@ -19,7 +19,8 @@ set -e -u -x
 
 
 ## Vars ----------------------------------------------------------------------
-export ADMIN_PASSWORD=${ADMIN_PASSWORD:-"secrete"}
+DEFAULT_PASSWORD=$(head -c 64 /dev/urandom | tr -dc 'a-zA-Z0-9')
+export ADMIN_PASSWORD=${ADMIN_PASSWORD:-$DEFAULT_PASSWORD}
 export SERVICE_REGION=${SERVICE_REGION:-"RegionOne"}
 export DEPLOY_SWIFT=${DEPLOY_SWIFT:-"yes"}
 export GET_PIP_URL=${GET_PIP_URL:-"https://bootstrap.pypa.io/get-pip.py"}
diff --git a/scripts/osad-aio-heat-template.yml b/scripts/osad-aio-heat-template.yml
index 755c579b2f..3757f0778c 100644
--- a/scripts/osad-aio-heat-template.yml
+++ b/scripts/osad-aio-heat-template.yml
@@ -56,8 +56,10 @@ outputs:
     value: { get_attr: [ OSADAIO, first_address ] }
   OSADAIO_password:
     description: The password for all the things.
-    value: secrete
+    value: { get_attr: [ OSADAIO_random_pass, value ] }
 resources:
+  OSADAIO_random_pass:
+    type: OS::Heat::RandomString
   OSADAIO_port:
     type: OS::Neutron::Port
     properties: