diff --git a/.yamato/_abv.yml b/.yamato/_abv.yml
index e11c0a8c536..a95af6178f7 100644
--- a/.yamato/_abv.yml
+++ b/.yamato/_abv.yml
@@ -92,6 +92,8 @@ all_project_ci_nightly_2020.1:
     dependencies:
       -  path: .yamato/_abv.yml#all_project_ci_2020.1
          rerun: on-new-revision
+      -  path: .yamato/_templates.yml#all_template_ci_2020.1
+         rerun: on-new-revision
       -  path: .yamato/_abv.yml#smoke_test_Standalone_2020.1
          rerun: on-new-revision
       -  path: .yamato/_abv.yml#smoke_test_playmode_2020.1
diff --git a/.yamato/_templates.yml b/.yamato/_templates.yml
index f63500a22f8..21a887bf5a9 100644
--- a/.yamato/_templates.yml
+++ b/.yamato/_templates.yml
@@ -51,7 +51,7 @@ test_hdrp_template_windows_2020.1:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
       -  copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
-      -  upm-ci template test -u .\.Editor --project-path com.unity.template-hd
+      -  upm-ci template test -u .\.Editor --project-path com.unity.template-hd --semver-type minor
     artifacts:
         logs:
             paths:
@@ -76,7 +76,7 @@ test_hdrp_template_windows_2020.1_dependencies:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
       -  copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
-      -  upm-ci template test -u .\.Editor --type updated-dependencies-tests --project-path com.unity.template-hd
+      -  upm-ci template test -u .\.Editor --type updated-dependencies-tests --project-path com.unity.template-hd --semver-type minor
     artifacts:
         logs:
             paths:
@@ -99,7 +99,7 @@ test_universal_template_windows_2020.1:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
       -  copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
-      -  upm-ci template test -u .\.Editor --project-path com.unity.template-universal
+      -  upm-ci template test -u .\.Editor --project-path com.unity.template-universal --semver-type minor
     artifacts:
         logs:
             paths:
@@ -122,7 +122,7 @@ test_universal_template_windows_2020.1_dependencies:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
       -  copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
-      -  upm-ci template test -u .\.Editor --type updated-dependencies-tests --project-path com.unity.template-universal
+      -  upm-ci template test -u .\.Editor --type updated-dependencies-tests --project-path com.unity.template-universal --semver-type minor
     artifacts:
         logs:
             paths:
@@ -147,7 +147,7 @@ test_hdrp_template_macos_2020.1:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
       -  cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
-      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-hd
+      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-hd --semver-type minor
     artifacts:
         logs:
             paths:
@@ -172,7 +172,7 @@ test_hdrp_template_macos_2020.1_dependencies:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
       -  cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
-      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --type updated-dependencies-tests --project-path com.unity.template-hd
+      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --type updated-dependencies-tests --project-path com.unity.template-hd --semver-type minor
     artifacts:
         logs:
             paths:
@@ -195,7 +195,7 @@ test_universal_template_macos_2020.1:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
       -  cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
-      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-universal
+      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-universal --semver-type minor
     artifacts:
         logs:
             paths:
@@ -218,7 +218,7 @@ test_universal_template_macos_2020.1_dependencies:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
       -  cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
-      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --type updated-dependencies-tests --project-path com.unity.template-universal
+      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --type updated-dependencies-tests --project-path com.unity.template-universal --semver-type minor
     artifacts:
         logs:
             paths:
@@ -243,7 +243,7 @@ test_hdrp_template_windows_fast-2020.1:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
       -  copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
-      -  upm-ci template test -u .\.Editor --project-path com.unity.template-hd
+      -  upm-ci template test -u .\.Editor --project-path com.unity.template-hd --semver-type minor
     artifacts:
         logs:
             paths:
@@ -268,7 +268,7 @@ test_hdrp_template_windows_fast-2020.1_dependencies:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
       -  copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
-      -  upm-ci template test -u .\.Editor --type updated-dependencies-tests --project-path com.unity.template-hd
+      -  upm-ci template test -u .\.Editor --type updated-dependencies-tests --project-path com.unity.template-hd --semver-type minor
     artifacts:
         logs:
             paths:
@@ -291,7 +291,7 @@ test_universal_template_windows_fast-2020.1:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
       -  copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
-      -  upm-ci template test -u .\.Editor --project-path com.unity.template-universal
+      -  upm-ci template test -u .\.Editor --project-path com.unity.template-universal --semver-type minor
     artifacts:
         logs:
             paths:
@@ -314,7 +314,7 @@ test_universal_template_windows_fast-2020.1_dependencies:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
       -  copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
-      -  upm-ci template test -u .\.Editor --type updated-dependencies-tests --project-path com.unity.template-universal
+      -  upm-ci template test -u .\.Editor --type updated-dependencies-tests --project-path com.unity.template-universal --semver-type minor
     artifacts:
         logs:
             paths:
@@ -339,7 +339,7 @@ test_hdrp_template_macos_fast-2020.1:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
       -  cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
-      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-hd
+      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-hd --semver-type minor
     artifacts:
         logs:
             paths:
@@ -364,7 +364,7 @@ test_hdrp_template_macos_fast-2020.1_dependencies:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
       -  cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
-      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --type updated-dependencies-tests --project-path com.unity.template-hd
+      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --type updated-dependencies-tests --project-path com.unity.template-hd --semver-type minor
     artifacts:
         logs:
             paths:
@@ -387,7 +387,7 @@ test_universal_template_macos_fast-2020.1:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
       -  cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
-      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-universal
+      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-universal --semver-type minor
     artifacts:
         logs:
             paths:
@@ -410,7 +410,7 @@ test_universal_template_macos_fast-2020.1_dependencies:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
       -  cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
-      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --type updated-dependencies-tests --project-path com.unity.template-universal
+      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --type updated-dependencies-tests --project-path com.unity.template-universal --semver-type minor
     artifacts:
         logs:
             paths:
@@ -435,7 +435,7 @@ test_hdrp_template_windows_CUSTOM-REVISION:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
       -  copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
-      -  upm-ci template test -u .\.Editor --project-path com.unity.template-hd
+      -  upm-ci template test -u .\.Editor --project-path com.unity.template-hd --semver-type minor
     artifacts:
         logs:
             paths:
@@ -460,7 +460,7 @@ test_hdrp_template_windows_CUSTOM-REVISION_dependencies:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
       -  copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
-      -  upm-ci template test -u .\.Editor --type updated-dependencies-tests --project-path com.unity.template-hd
+      -  upm-ci template test -u .\.Editor --type updated-dependencies-tests --project-path com.unity.template-hd --semver-type minor
     artifacts:
         logs:
             paths:
@@ -483,7 +483,7 @@ test_universal_template_windows_CUSTOM-REVISION:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
       -  copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
-      -  upm-ci template test -u .\.Editor --project-path com.unity.template-universal
+      -  upm-ci template test -u .\.Editor --project-path com.unity.template-universal --semver-type minor
     artifacts:
         logs:
             paths:
@@ -506,7 +506,7 @@ test_universal_template_windows_CUSTOM-REVISION_dependencies:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
       -  copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
-      -  upm-ci template test -u .\.Editor --type updated-dependencies-tests --project-path com.unity.template-universal
+      -  upm-ci template test -u .\.Editor --type updated-dependencies-tests --project-path com.unity.template-universal --semver-type minor
     artifacts:
         logs:
             paths:
@@ -531,7 +531,7 @@ test_hdrp_template_macos_CUSTOM-REVISION:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
       -  cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
-      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-hd
+      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-hd --semver-type minor
     artifacts:
         logs:
             paths:
@@ -556,7 +556,7 @@ test_hdrp_template_macos_CUSTOM-REVISION_dependencies:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
       -  cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
-      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --type updated-dependencies-tests --project-path com.unity.template-hd
+      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --type updated-dependencies-tests --project-path com.unity.template-hd --semver-type minor
     artifacts:
         logs:
             paths:
@@ -579,7 +579,7 @@ test_universal_template_macos_CUSTOM-REVISION:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
       -  cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
-      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-universal
+      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-universal --semver-type minor
     artifacts:
         logs:
             paths:
@@ -602,7 +602,7 @@ test_universal_template_macos_CUSTOM-REVISION_dependencies:
       -  unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
       -  cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
       -  cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
-      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --type updated-dependencies-tests --project-path com.unity.template-universal
+      -  upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --type updated-dependencies-tests --project-path com.unity.template-universal --semver-type minor
     artifacts:
         logs:
             paths:
diff --git a/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py b/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py
index 5be3eb2a0a3..c7c2a5eabb2 100644
--- a/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py
+++ b/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py
@@ -14,9 +14,14 @@ def __init__(self, editor, projects, test_platforms, nightly_config, target_bran
     def get_job_definition(self, editor, projects, test_platforms, extra_dependencies, target_branch): 
 
         # define dependencies
-        dependencies = [{
+        dependencies = [
+            {
                 'path': f'{abv_filepath()}#{abv_job_id_all_project_ci(editor["version"])}',
-                'rerun': editor["rerun_strategy"]}]
+                'rerun': editor["rerun_strategy"]},
+            {
+                'path': f'{templates_filepath()}#{template_job_id_test_all(editor["version"])}',
+                'rerun': editor["rerun_strategy"]
+            }]
 
         for test_platform in test_platforms: # TODO replace with all_smoke_tests if rerun strategy can override lower level ones
             dependencies.append({
diff --git a/.yamato/ruamel/jobs/templates/template_test.py b/.yamato/ruamel/jobs/templates/template_test.py
index bf43487fa04..e83dceac1d0 100644
--- a/.yamato/ruamel/jobs/templates/template_test.py
+++ b/.yamato/ruamel/jobs/templates/template_test.py
@@ -29,7 +29,7 @@ def get_job_definition(self, template, platform, editor):
             commands.append(f'cp {PATH_PACKAGES_temp}/**/upm-ci~/packages/*.tgz upm-ci~/packages')
         if template.get('hascodependencies', None) is not None:
             commands.append(platform["copycmd"])
-        commands.append(f'upm-ci template test -u {platform["editorpath"]} --project-path {template["packagename"]}')
+        commands.append(f'upm-ci template test -u {platform["editorpath"]} --project-path {template["packagename"]} --semver-type minor')
 
 
         # construct job
diff --git a/.yamato/ruamel/jobs/templates/template_test_dependencies.py b/.yamato/ruamel/jobs/templates/template_test_dependencies.py
index 32f541d54de..1e0cd9d5a1d 100644
--- a/.yamato/ruamel/jobs/templates/template_test_dependencies.py
+++ b/.yamato/ruamel/jobs/templates/template_test_dependencies.py
@@ -29,7 +29,7 @@ def get_job_definition(yml, template, platform, editor):
             commands.append(f'cp {PATH_PACKAGES_temp}/**/upm-ci~/packages/*.tgz upm-ci~/packages')
         if template.get('hascodependencies', None) is not None:
             commands.append(platform["copycmd"])
-        commands.append(f'upm-ci template test -u {platform["editorpath"]} --type updated-dependencies-tests --project-path {template["packagename"]}')
+        commands.append(f'upm-ci template test -u {platform["editorpath"]} --type updated-dependencies-tests --project-path {template["packagename"]} --semver-type minor')
 
 
         # construct job
diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md b/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md
index 8bf2c18f65d..d2773caf715 100644
--- a/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md
+++ b/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md
@@ -22,7 +22,7 @@ The version number for this package has increased due to a version update of a r
 ### Fixed
 - Fixed camera from always rendering into a RenderTexture, this caused un-needed performance slowdown
 
-## [7.1.7] - 2019-12-3
+## [7.1.7] - 2019-12-03
 - Editor will force text serialization to occur on one line
 
 ## [7.1.6] - 2019-11-22
@@ -146,14 +146,14 @@ The version number for this package has increased due to a version update of a r
 - Physics.autoSyncTransforms property now defaults to false.
 - Physics2D.autoSyncTransforms property now defaults to false.
 
-## [1.1.0] - 2018-24-10
+## [1.1.0] - 2018-10-24
 
 ### Changed
 - Updating LW Version 
 - AndroidTVCompatibility to false
 
 
-## [1.0.6] - 2018-24-09
+## [1.0.6] - 2018-09-24
 
 ### Changed
 - Oculus XR settings default to dash support and depth export enabled.
@@ -191,7 +191,7 @@ The version number for this package has increased due to a version update of a r
 - Removed Vertex Lighting from all lightweight assets
 - Added soft shadows to Lightweight high quality and medium quality assets
 
-## [1.0.0] - 2018-2-25
+## [1.0.0] - 2018-02-25
 
 ### Added
 - Sample static meshes to show best practices
@@ -204,17 +204,17 @@ The version number for this package has increased due to a version update of a r
 - Additional setting and lighting polish
 - Removing basic content (red cube)
 
-## [0.0.5] - 2018-1-29
+## [0.0.5] - 2018-01-29
 
 ### Added
 - cinemachine and text mesh pro packages
 
-## [0.0.4] - 2018-1-29
+## [0.0.4] - 2018-01-29
 
 ### Added
 - cinemachine and text mesh pro packages
 
-## [0.0.3] - 2018-1-26 
+## [0.0.3] - 2018-01-26 
 
 ### Changed 
 - Updating Shadergraph and lightweight to new version