diff --git a/stack.sh b/stack.sh
index 9ecc49c..af44feb 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1173,7 +1173,7 @@
 # See https://help.ubuntu.com/community/CloudInit for more on ``cloud-init``
 
 if is_service_enabled g-reg; then
-    TOKEN=$(keystone token-get | grep ' id ' | get_field 2)
+    TOKEN=$(openstack token issue -c id -f value)
     die_if_not_set $LINENO TOKEN "Keystone fail to get token"
 
     echo_summary "Uploading images"