diff --git a/etc/default-overrides.conf b/etc/default-overrides.conf
index a0b44d62..d22d390f 100644
--- a/etc/default-overrides.conf
+++ b/etc/default-overrides.conf
@@ -21,7 +21,7 @@ tempest_roles = _member_
 
 # Should the tests ssh to instances? (boolean value)
 #run_ssh=false $$$ REDHAT: use true
-# This should really
+# This parameter is deprecated and will be removed in a future release
 image_ssh_user = cirros
 
 [identity]
@@ -117,3 +117,6 @@ preserve_ports=true
 [network-feature-enabled]
 # Added in juno
 ipv6_subnet_attributes=true
+
+[validation]
+image_ssh_user = cirros