diff --git a/callback_plugins/validation_json.py b/callback_plugins/validation_json.py
index d78f1cd60..ffbda4a66 100644
--- a/callback_plugins/validation_json.py
+++ b/callback_plugins/validation_json.py
@@ -20,7 +20,7 @@ __metaclass__ = type
 import datetime
 import json
 import time
-import os.path
+import os
 
 from functools import partial
 
@@ -75,7 +75,8 @@ class CallbackModule(CallbackBase):
                 'host': play.get_name(),
                 'validation_id': self.env['playbook_name'],
                 'validation_path': self.env['playbook_path'],
-                'id': str(play._uuid),
+                'id': (os.getenv('ANSIBLE_UUID') if os.getenv('ANSIBLE_UUID')
+                       else str(play._uuid)),
                 'duration': {
                     'start': current_time()
                 }
@@ -147,7 +148,8 @@ class CallbackModule(CallbackBase):
 
         log_file = "{}/{}_{}_{}.json".format(
             VALIDATIONS_LOG_DIR,
-            self.results[0].get('play').get('id'),
+            (os.getenv('ANSIBLE_UUID') if os.getenv('ANSIBLE_UUID') else
+             self.results[0].get('play').get('id')),
             self.env['playbook_name'],
             self.current_time)
 
diff --git a/doc/source/_exts/generate_validations_doc.py b/doc/source/_exts/generate_validations_doc.py
index 321675176..977b5af04 100644
--- a/doc/source/_exts/generate_validations_doc.py
+++ b/doc/source/_exts/generate_validations_doc.py
@@ -103,7 +103,6 @@ Role documentation
                 name=validation['name'],
                 desc=validation['description'],
                 groups=', '.join(validation['groups']),
-                metadata=format_dict(validation['metadata']),
                 hosts=validation['hosts'],
                 parameters=format_dict(validation['parameters']),
                 roles=validation['roles']