diff --git a/helm-toolkit/templates/scripts/_ks-domain-user.sh.tpl b/helm-toolkit/templates/scripts/_ks-domain-user.sh.tpl
index 0680f91cc6..db9bd6f75a 100644
--- a/helm-toolkit/templates/scripts/_ks-domain-user.sh.tpl
+++ b/helm-toolkit/templates/scripts/_ks-domain-user.sh.tpl
@@ -46,6 +46,9 @@ SERVICE_OS_USERID=$(openstack user create --or-show --enable -f value -c id \
     --password="${SERVICE_OS_PASSWORD}" \
     "${SERVICE_OS_USERNAME}")
 
+# Manage user password (we do this to ensure the password is updated if required)
+openstack user set --password="${SERVICE_OS_PASSWORD}" "${SERVICE_OS_USERID}"
+
 # Display user
 openstack user show "${SERVICE_OS_USERID}"
 
diff --git a/helm-toolkit/templates/scripts/_ks-user.sh.tpl b/helm-toolkit/templates/scripts/_ks-user.sh.tpl
index 71121a3877..67a9f3ceab 100644
--- a/helm-toolkit/templates/scripts/_ks-user.sh.tpl
+++ b/helm-toolkit/templates/scripts/_ks-user.sh.tpl
@@ -51,6 +51,9 @@ USER_ID=$(openstack user create --or-show --enable -f value -c id \
     --password="${SERVICE_OS_PASSWORD}" \
     "${SERVICE_OS_USERNAME}");
 
+# Manage user password (we do this to ensure the password is updated if required)
+openstack user set --password="${SERVICE_OS_PASSWORD}" "${USER_ID}"
+
 # Display user
 openstack user show "${USER_ID}"