diff --git a/scripts/novarc b/scripts/novarc
index 2ae0dfb2..8e0c16ad 100644
--- a/scripts/novarc
+++ b/scripts/novarc
@@ -5,8 +5,8 @@ for param in $_OS_PARAMS; do
     unset $param
 done
 
-_keystone_ip=$(juju run $_juju_model_arg --unit keystone/leader 'unit-get private-address')
-_password=$(juju run $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
+_keystone_ip=$(juju exec $_juju_model_arg --unit keystone/leader 'unit-get private-address')
+_password=$(juju exec $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
 
 unset _OS_PARAMS
 export OS_USERNAME=admin
diff --git a/scripts/novarcv3_demo_project b/scripts/novarcv3_demo_project
index 869847f1..56d74ac6 100644
--- a/scripts/novarcv3_demo_project
+++ b/scripts/novarcv3_demo_project
@@ -6,7 +6,7 @@ for param in $_OS_PARAMS; do
 done
 unset _OS_PARAMS
 
-_keystone_ip=$(juju run $_juju_model_arg --unit keystone/leader 'unit-get private-address')
+_keystone_ip=$(juju exec $_juju_model_arg --unit keystone/leader 'unit-get private-address')
 
 export OS_AUTH_URL=${OS_AUTH_PROTOCOL:-http}://${_keystone_ip}:5000/v3
 export OS_USERNAME=demo
diff --git a/scripts/novarcv3_domain b/scripts/novarcv3_domain
index e896d3c1..9c3e1f4e 100644
--- a/scripts/novarcv3_domain
+++ b/scripts/novarcv3_domain
@@ -6,8 +6,8 @@ for param in $_OS_PARAMS; do
 done
 unset _OS_PARAMS
 
-_keystone_ip=$(juju run $_juju_model_arg --unit keystone/leader 'unit-get private-address')
-_password=$(juju run $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
+_keystone_ip=$(juju exec $_juju_model_arg --unit keystone/leader 'unit-get private-address')
+_password=$(juju exec $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
 
 export OS_AUTH_URL=${OS_AUTH_PROTOCOL:-http}://${_keystone_ip}:5000/v3
 export OS_USERNAME=admin
diff --git a/scripts/novarcv3_project b/scripts/novarcv3_project
index 120794e8..690f370a 100644
--- a/scripts/novarcv3_project
+++ b/scripts/novarcv3_project
@@ -6,8 +6,8 @@ for param in $_OS_PARAMS; do
 done
 unset _OS_PARAMS
 
-_keystone_ip=$(juju run $_juju_model_arg --unit keystone/leader 'unit-get private-address')
-_password=$(juju run $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
+_keystone_ip=$(juju exec $_juju_model_arg --unit keystone/leader 'unit-get private-address')
+_password=$(juju exec $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
 
 export OS_AUTH_URL=${OS_AUTH_PROTOCOL:-http}://${_keystone_ip}:5000/v3
 export OS_USERNAME=admin
diff --git a/scripts/novarcv3_ssl_demo_project b/scripts/novarcv3_ssl_demo_project
index 6be18d48..4c73b729 100644
--- a/scripts/novarcv3_ssl_demo_project
+++ b/scripts/novarcv3_ssl_demo_project
@@ -10,8 +10,8 @@ unset _OS_PARAMS
 test -d $HOME/.cache || mkdir $HOME/.cache
 _root_ca=$HOME/.cache/openstack-root-ca.crt
 
-_keystone_ip=$(juju run $_juju_model_arg --unit keystone/leader 'unit-get private-address')
-juju run $_juju_model_arg --unit vault/leader 'leader-get root-ca' > ${_root_ca}
+_keystone_ip=$(juju exec $_juju_model_arg --unit keystone/leader 'unit-get private-address')
+juju exec $_juju_model_arg --unit vault/leader 'leader-get root-ca' > ${_root_ca}
 
 export OS_AUTH_PROTOCOL=https
 export OS_CACERT=${_root_ca}
diff --git a/scripts/novarcv3_ssl_domain b/scripts/novarcv3_ssl_domain
index 4c45c389..c77eac7a 100644
--- a/scripts/novarcv3_ssl_domain
+++ b/scripts/novarcv3_ssl_domain
@@ -10,9 +10,9 @@ unset _OS_PARAMS
 test -d $HOME/.cache || mkdir $HOME/.cache
 _root_ca=$HOME/.cache/openstack-root-ca.crt
 
-_keystone_ip=$(juju run $_juju_model_arg --unit keystone/leader 'unit-get private-address')
-_password=$(juju run $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
-juju run $_juju_model_arg --unit vault/leader 'leader-get root-ca' > ${_root_ca}
+_keystone_ip=$(juju exec $_juju_model_arg --unit keystone/leader 'unit-get private-address')
+_password=$(juju exec $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
+juju exec $_juju_model_arg --unit vault/leader 'leader-get root-ca' > ${_root_ca}
 
 export OS_AUTH_PROTOCOL=https
 export OS_CACERT=${_root_ca}
diff --git a/scripts/novarcv3_ssl_project b/scripts/novarcv3_ssl_project
index 647b9e7d..f31bb2f5 100644
--- a/scripts/novarcv3_ssl_project
+++ b/scripts/novarcv3_ssl_project
@@ -10,9 +10,9 @@ unset _OS_PARAMS
 test -d $HOME/.cache || mkdir $HOME/.cache
 _root_ca=$HOME/.cache/openstack-root-ca.crt
 
-_keystone_ip=$(juju run $_juju_model_arg --unit keystone/leader 'unit-get private-address')
-_password=$(juju run $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
-juju run $_juju_model_arg --unit vault/leader 'leader-get root-ca' > ${_root_ca}
+_keystone_ip=$(juju exec $_juju_model_arg --unit keystone/leader 'unit-get private-address')
+_password=$(juju exec $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
+juju exec $_juju_model_arg --unit vault/leader 'leader-get root-ca' > ${_root_ca}
 
 export OS_AUTH_PROTOCOL=https
 export OS_CACERT=${_root_ca}