diff --git a/.yamato/config.metadata b/.yamato/config.metadata
index 76a5361f54..7164e5f61b 100644
--- a/.yamato/config.metadata
+++ b/.yamato/config.metadata
@@ -4,6 +4,8 @@ editors:
     disable_tvos_run: true
   - version: 6000.0
     disable_tvos_run: true
+  - version: 6000.1
+    disable_tvos_run: true
   - version: trunk
     disable_tvos_run: true
 
diff --git a/Tools/CI/README_AFTER_REGENERATION.md b/Tools/CI/README_AFTER_REGENERATION.md
new file mode 100644
index 0000000000..d3d2d3cdd2
--- /dev/null
+++ b/Tools/CI/README_AFTER_REGENERATION.md
@@ -0,0 +1,4 @@
+After you regenerate the yamato jobs you need to make the following edit:
+
+In .yamato\wrench\validation-jobs.yml find "validate_-_inputsystem_-_2019_4_-_ubuntu"-job and change
+"image: package-ci/ubuntu-20.04:default" to "image: package-ci/ubuntu-18.04:v4"