diff --git a/createAllManifests.ps1 b/createAllManifests.ps1
index 306570061..3c070f3ac 100644
--- a/createAllManifests.ps1
+++ b/createAllManifests.ps1
@@ -17,28 +17,28 @@ $createScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'createManifest.ps1
 
 
 $latestStableUbuntu   = "ubuntu-bionic"
-$latestStableWsc1709  = "windowsservercore-1709"
 $latestStableWscLtsc  = "windowsservercore-latest"
 $latestStableWsc1803  = "windowsservercore-1803"
 $latestStableWsc1809  = "windowsservercore-1809"
-$latestStableNano1709 = "nanoserver-1709"
+$latestStableWsc1903  = "windowsservercore-1903"
 $latestStableNano1803 = "nanoserver-1803"
 $latestStableNano1809 = "nanoserver-1809"
+$latestStableNano1903 = "nanoserver-1903"
 
 $latestPreviewUbuntu   = "preview-ubuntu-bionic"
-$latestPreviewWsc1709  = "preview-windowsservercore-1709"
 $latestPreviewWscLtsc  = "preview-windowsservercore-latest"
 $latestPreviewWsc1803  = "preview-windowsservercore-1803"
 $latestPreviewWsc1809  = "preview-windowsservercore-1809"
+$latestPreviewWsc1903  = "preview-windowsservercore-1809"
 
 switch ($Channel)
 {
     'preview' {
-        &$createScriptPath -ContainerRegistry $Registry -taglist $latestPreviewUbuntu, $latestPreviewWsc1709, $latestPreviewWscLtsc, $latestPreviewWsc1803, $latestPreviewWsc1809  -ManifestTag 'preview'
+        &$createScriptPath -ContainerRegistry $Registry -taglist $latestPreviewUbuntu, $latestPreviewWsc1903, $latestPreviewWscLtsc, $latestPreviewWsc1803, $latestPreviewWsc1809  -ManifestTag 'preview'
     }
 
     'stable' {
-        &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableUbuntu, $latestStableWsc1709, $latestStableWscLtsc, $latestStableWsc1803, $latestStableWsc1809 -ManifestTag 'latest'
-        &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableNano1709, $latestStableNano1803, $latestStableNano1809 -ManifestTag 'nanoserver'
+        &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableUbuntu, $latestStableWsc1903, $latestStableWscLtsc, $latestStableWsc1803, $latestStableWsc1809 -ManifestTag 'latest'
+        &$createScriptPath -ContainerRegistry $Registry -taglist $latestStableNano1903, $latestStableNano1803, $latestStableNano1809 -ManifestTag 'nanoserver'
     }
 }
diff --git a/release/preview/nanoserver/meta.json b/release/preview/nanoserver/meta.json
index f82851416..e46c68334 100644
--- a/release/preview/nanoserver/meta.json
+++ b/release/preview/nanoserver/meta.json
@@ -3,7 +3,6 @@
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
     "osVersion": "Nano Server, version ${fromTag}",
     "shortTags": [
-        {"Tag": "1709"},
         {"Tag": "1803"}
     ],
     "tagTemplates": [
diff --git a/release/preview/nanoserver1809/getLatestTag.ps1 b/release/preview/nanoserver1809/getLatestTag.ps1
index b092d66b1..2c7ce394f 100644
--- a/release/preview/nanoserver1809/getLatestTag.ps1
+++ b/release/preview/nanoserver1809/getLatestTag.ps1
@@ -17,4 +17,5 @@ $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}_KB\d{7}(_amd64)?$' -Mcr
+Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}[-_]KB\d{7}([\-_]amd64)?$' -Mcr
+
diff --git a/release/preview/nanoserver1809/meta.json b/release/preview/nanoserver1809/meta.json
index 713bd8776..8396b1ce0 100644
--- a/release/preview/nanoserver1809/meta.json
+++ b/release/preview/nanoserver1809/meta.json
@@ -3,7 +3,8 @@
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
     "osVersion": "Nano Server, version ${fromTag}",
     "shortTags": [
-        {"Tag": "1809"}
+        {"Tag": "1809"},
+        {"Tag": "1903"}
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#tag#",
diff --git a/release/preview/windowsservercore/getLatestTag.ps1 b/release/preview/windowsservercore/getLatestTag.ps1
index a2d2c8d16..cf9142c8c 100644
--- a/release/preview/windowsservercore/getLatestTag.ps1
+++ b/release/preview/windowsservercore/getLatestTag.ps1
@@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath -Force
 
 # The versions of nanoserver we care about
-$shortTags = @('1709','1803','1809')
+$shortTags = @('1803','1809','1903')
 
-Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}_KB\d{7}' -Mcr
+Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
diff --git a/release/stable/nanoserver/meta.json b/release/stable/nanoserver/meta.json
index 67cf6883f..32cbc495e 100644
--- a/release/stable/nanoserver/meta.json
+++ b/release/stable/nanoserver/meta.json
@@ -3,7 +3,6 @@
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
     "osVersion": "Nano Server, version ${fromTag}",
     "shortTags": [
-        {"Tag": "1709"},
         {"Tag": "1803"}
     ],
     "tagTemplates": [
diff --git a/release/stable/nanoserver1809/getLatestTag.ps1 b/release/stable/nanoserver1809/getLatestTag.ps1
index 9f2ad1cac..2c7ce394f 100644
--- a/release/stable/nanoserver1809/getLatestTag.ps1
+++ b/release/stable/nanoserver1809/getLatestTag.ps1
@@ -17,10 +17,5 @@ $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-if($CI.IsPresent)
-{
-    Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '^1809$' -Mcr
-}
-else {
-    Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}_KB\d{7}(_amd64)?$' -Mcr
-}
+Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/nanoserver" -FullTagFilter '\d{4}[-_]KB\d{7}([\-_]amd64)?$' -Mcr
+
diff --git a/release/stable/nanoserver1809/meta.json b/release/stable/nanoserver1809/meta.json
index 0805eb96d..52fb86d9a 100644
--- a/release/stable/nanoserver1809/meta.json
+++ b/release/stable/nanoserver1809/meta.json
@@ -3,7 +3,8 @@
     "PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
     "osVersion": "Nano Server, version ${fromTag}",
     "shortTags": [
-        {"Tag": "1809"}
+        {"Tag": "1809"},
+        {"Tag": "1903"}
     ],
     "tagTemplates": [
         "#psversion#-nanoserver-#tag#",
diff --git a/release/stable/windowsservercore/getLatestTag.ps1 b/release/stable/windowsservercore/getLatestTag.ps1
index a2d2c8d16..cf9142c8c 100644
--- a/release/stable/windowsservercore/getLatestTag.ps1
+++ b/release/stable/windowsservercore/getLatestTag.ps1
@@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath -Force
 
 # The versions of nanoserver we care about
-$shortTags = @('1709','1803','1809')
+$shortTags = @('1803','1809','1903')
 
-Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}_KB\d{7}' -Mcr
+Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
diff --git a/tools/getDockerTags/getDockerTags.psm1 b/tools/getDockerTags/getDockerTags.psm1
index ba9c826c6..6e0e3fd1a 100644
--- a/tools/getDockerTags/getDockerTags.psm1
+++ b/tools/getDockerTags/getDockerTags.psm1
@@ -6,7 +6,9 @@
 function Get-DockerTagsList
 {
     param(
+        [Parameter(Mandatory)]
         [string] $Url,
+        [Parameter(Mandatory)]
         [ValidateSet('name', 'tags')]
         [string] $PropertyName
     )
@@ -26,6 +28,10 @@ function Get-DockerTagsList
                 $results.$propertyName | ForEach-Object {Write-Output $_}
                 $nextUrl = $null
             }
+            else
+            {
+                $nextUrl = $null
+            }
         }
     }
     catch
@@ -149,5 +155,6 @@ function Get-DockerTags
 }
 
 Export-ModuleMember -Function @(
-    'Get-DockerTags'
+    'Get-DockerTags',
+    'Get-DockerTagsList'
 )
diff --git a/vsts-ci.yml b/vsts-ci.yml
index e11d48af6..4d4b231f7 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -144,7 +144,7 @@ jobs:
     imagename: nanoserver1809
     vmImage: windows-2019
     preview: false
-    ciParameter: '-CI'
+    ciParameter: '-CI -TagFilter 1809'
     continueonerror: false
 
 # Use the TagFilter to filter to 1809 because the docker instance inside the agent only supports 1809