diff --git a/docs/samples/ci/azure-pipelines/custom/azure-pipelines.generate.yml b/docs/samples/ci/azure-pipelines/custom/azure-pipelines.generate.yml
index 512bf2c..e0bb3fd 100644
--- a/docs/samples/ci/azure-pipelines/custom/azure-pipelines.generate.yml
+++ b/docs/samples/ci/azure-pipelines/custom/azure-pipelines.generate.yml
@@ -4,4 +4,4 @@ steps:
 - template: templates/azure-pipelines/entrypoint/generate.yml@PSRepositoryReleaseManager
   parameters:
     NOTES_PATH: path/to/my-release-notes.md
-    VARIANT: DateHistory-HashSubject-NoMerges
+    VARIANT: VersionDate-HashSubject-NoMerges
diff --git a/docs/samples/ci/azure-pipelines/generic/azure-pipelines.linux.container.yml b/docs/samples/ci/azure-pipelines/generic/azure-pipelines.linux.container.yml
index 412cfec..dd0a3ce 100644
--- a/docs/samples/ci/azure-pipelines/generic/azure-pipelines.linux.container.yml
+++ b/docs/samples/ci/azure-pipelines/generic/azure-pipelines.linux.container.yml
@@ -25,8 +25,8 @@ stages:
   - job: linux_container
     displayName: '[Linux] [Container] PowerShell Core'
     pool:
-      vmImage: ubuntu-18.04
-    container: theohbrothers/docker-powershell:7.1.3-ubuntu-18.04-20210316-git
+      vmImage: ubuntu-latest
+    container: theohbrothers/docker-powershell:7.3-ubuntu-22.04-git
     steps:
     - checkout: self
       submodules: recursive
diff --git a/docs/samples/ci/azure-pipelines/generic/azure-pipelines.linux.yml b/docs/samples/ci/azure-pipelines/generic/azure-pipelines.linux.yml
index 8ca64a3..d99e889 100644
--- a/docs/samples/ci/azure-pipelines/generic/azure-pipelines.linux.yml
+++ b/docs/samples/ci/azure-pipelines/generic/azure-pipelines.linux.yml
@@ -23,9 +23,9 @@ stages:
   displayName: Release
   jobs:
   - job: linux
-    displayName: '[Windows] PowerShell Core'
+    displayName: '[Linux] PowerShell Core'
     pool:
-      vmImage: ubuntu-18.04
+      vmImage: ubuntu-latest
     steps:
     - checkout: self
       submodules: recursive
diff --git a/docs/samples/ci/azure-pipelines/generic/azure-pipelines.macos.yml b/docs/samples/ci/azure-pipelines/generic/azure-pipelines.macos.yml
index baf65c6..f833aeb 100644
--- a/docs/samples/ci/azure-pipelines/generic/azure-pipelines.macos.yml
+++ b/docs/samples/ci/azure-pipelines/generic/azure-pipelines.macos.yml
@@ -25,7 +25,7 @@ stages:
   - job: macos
     displayName: '[macOS] PowerShell Core'
     pool:
-      vmImage: macOS-10.15
+      vmImage: macOS-latest
     steps:
     - checkout: self
       submodules: recursive
diff --git a/docs/samples/ci/azure-pipelines/generic/azure-pipelines.windows.powershell.5.1.yml b/docs/samples/ci/azure-pipelines/generic/azure-pipelines.windows.powershell.5.1.yml
index dd3596b..ca9a6b6 100644
--- a/docs/samples/ci/azure-pipelines/generic/azure-pipelines.windows.powershell.5.1.yml
+++ b/docs/samples/ci/azure-pipelines/generic/azure-pipelines.windows.powershell.5.1.yml
@@ -25,7 +25,7 @@ stages:
   - job: windows_powershell_5_1
     displayName: '[Windows] PowerShell 5.1'
     pool:
-      vmImage: windows-2019
+      vmImage: windows-latest
     steps:
     - checkout: self
       submodules: recursive
diff --git a/docs/samples/ci/azure-pipelines/generic/azure-pipelines.windows.pwsh.yml b/docs/samples/ci/azure-pipelines/generic/azure-pipelines.windows.pwsh.yml
index 337a7c9..4d5fdb7 100644
--- a/docs/samples/ci/azure-pipelines/generic/azure-pipelines.windows.pwsh.yml
+++ b/docs/samples/ci/azure-pipelines/generic/azure-pipelines.windows.pwsh.yml
@@ -22,10 +22,10 @@ stages:
 - stage: release
   displayName: Release
   jobs:
-  - job: windows_pwsh
+  - job: windows_powershell_core
     displayName: '[Windows] PowerShell Core'
     pool:
-      vmImage: windows-2019
+      vmImage: windows-latest
     steps:
     - checkout: self
       submodules: recursive