diff --git a/.azurepipelines/Ubuntu-GCC5.yml b/.azurepipelines/Linux.yml
similarity index 88%
rename from .azurepipelines/Ubuntu-GCC5.yml
rename to .azurepipelines/Linux.yml
index b9a3b851cf3c..4eaf26259d2f 100644
--- a/.azurepipelines/Ubuntu-GCC5.yml
+++ b/.azurepipelines/Linux.yml
@@ -1,5 +1,5 @@
 ## @file
-# Azure Pipeline build file for a build using ubuntu and GCC5
+# Azure Pipeline build file for a build using ubuntu and GCC
 #
 # Copyright (c) Microsoft Corporation.
 # Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>
diff --git a/.azurepipelines/ReadMe.md b/.azurepipelines/ReadMe.md
index cf57d282c197..02be00f88a33 100644
--- a/.azurepipelines/ReadMe.md
+++ b/.azurepipelines/ReadMe.md
@@ -19,7 +19,10 @@ Focused on building a single target platform and confirming functionality on tha
 * Platform CI files should be in the `<PlatformPkg>/.azurepipelines` folder.
 * Core CI files are in the root folder.
 * Shared templates are in the `templates` folder.
-* Top level CI files should be named `<host os>-<tool_chain_tag>.yml`
+* Top level CI files should be named `<host os>.yml`
+  * The pipeline YAML file name is referenced in Azure Pipelines. To allow flexibility for toolchain updates in the
+    YAML file without necessitating changes in Azure Pipelines, the toolchain is not included in the filename. For
+    example, `Windows.yml` is used instead of `Windows-VS2022.yml`.
 
 ## Links
 
diff --git a/.azurepipelines/Windows-VS2019.yml b/.azurepipelines/Windows.yml
similarity index 86%
rename from .azurepipelines/Windows-VS2019.yml
rename to .azurepipelines/Windows.yml
index 6dd48eafb1bd..30c9d5771bfd 100644
--- a/.azurepipelines/Windows-VS2019.yml
+++ b/.azurepipelines/Windows.yml
@@ -1,5 +1,5 @@
 ## @file
-# Azure Pipeline build file for a build using Windows and VS2022
+# Azure Pipeline build file for a build using Windows and Visual Studio
 #
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: BSD-2-Clause-Patent
diff --git a/.pytool/Readme.md b/.pytool/Readme.md
index 6da87403f17a..8a4c237b770b 100644
--- a/.pytool/Readme.md
+++ b/.pytool/Readme.md
@@ -48,7 +48,7 @@ located [here](https://github.com/tianocore/edk2-pytool-library) and
 [here](https://github.com/tianocore/edk2-pytool-extensions)).
 
 The primary execution flows can be found in the
-`.azurepipelines/Windows-VS2022.yml` and `.azurepipelines/Ubuntu-GCC5.yml`
+`.azurepipelines/Windows.yml` and `.azurepipelines/Ubuntu.yml`
 files. These YAML files are consumed by the Azure Dev Ops Build Pipeline and
 dictate what server resources should be used, how they should be configured, and
 what processes should be run on them. An overview of this schema can be found
diff --git a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/ArmVirtPkg/PlatformCI/.azurepipelines/Linux.yml
similarity index 100%
rename from ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
rename to ArmVirtPkg/PlatformCI/.azurepipelines/Linux.yml
diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/OvmfPkg/PlatformCI/.azurepipelines/Linux.yml
similarity index 100%
rename from OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
rename to OvmfPkg/PlatformCI/.azurepipelines/Linux.yml
diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows.yml
similarity index 100%
rename from OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
rename to OvmfPkg/PlatformCI/.azurepipelines/Windows.yml