diff --git a/build.ps1 b/build.ps1
index a62f7ade2..13610a28e 100644
--- a/build.ps1
+++ b/build.ps1
@@ -199,6 +199,7 @@ End {
     $dupeTagIssues = @()
 
     $toBuild = @()
+    $builtSubImages = @()
     foreach ($actualChannel in $Channels) {
         if ($PSCmdlet.ParameterSetName -match '.*ByName')
         {
@@ -263,25 +264,32 @@ End {
                     foreach ($tagGroup in $allMeta.ActualTagDataByGroup.Keys)
                     {
                         $actualTagData = $allMeta.ActualTagDataByGroup.$tagGroup
-                        Write-Verbose -Message "getting subimage - fromtag: $($tagGroup.Name) - subimage: $($allMeta.Meta.SubImage)"
                         $SubImagePath = Join-Path -Path $dockerFileName -ChildPath $allMeta.Meta.SubImage
-
-                        $subImageAllMeta = Get-DockerImageMetaDataWrapper `
-                            -DockerFileName $SubImagePath `
-                            -CI:$CI.IsPresent `
-                            -IncludeKnownIssues:$IncludeKnownIssues.IsPresent `
-                            -ChannelPath $channelPath `
-                            -TagFilter $TagFilter `
-                            -Version $windowsVersion `
-                            -ImageName $ImageName `
-                            -LinuxVersion $linuxVersion `
-                            -TagData $allMeta.TagData `
-                            -BaseImage $actualTagData.ActualTags[0] `
-                            -BaseRepositry $Repository `
-                            -Strict:$CheckForDuplicateTags.IsPresent
-
-
-                        $toBuild += $subImageAllMeta
+                        if($builtSubImages -notcontains $SubImagePath)
+                        {
+                            Write-Verbose -Message "getting subimage - fromtag: $($tagGroup.Name) - subimage: $($allMeta.Meta.SubImage)"
+                            $subImageAllMeta = Get-DockerImageMetaDataWrapper `
+                                -DockerFileName $SubImagePath `
+                                -CI:$CI.IsPresent `
+                                -IncludeKnownIssues:$IncludeKnownIssues.IsPresent `
+                                -ChannelPath $channelPath `
+                                -TagFilter $TagFilter `
+                                -Version $windowsVersion `
+                                -ImageName $ImageName `
+                                -LinuxVersion $linuxVersion `
+                                -TagData $allMeta.TagData `
+                                -BaseImage $actualTagData.ActualTags[0] `
+                                -BaseRepositry $Repository `
+                                -Strict:$CheckForDuplicateTags.IsPresent
+
+
+                            $toBuild += $subImageAllMeta
+                            $builtSubImages += $SubImagePath
+                        }
+                        else
+                        {
+                            Write-Verbose -Message "already got subimage - fromtag: $($tagGroup.Name) - subimage: $($allMeta.Meta.SubImage)"
+                        }
                     }
                 }
             }
diff --git a/release/preview/fedora28/dependabot/Dockerfile b/release/preview/fedora/dependabot/Dockerfile
similarity index 90%
rename from release/preview/fedora28/dependabot/Dockerfile
rename to release/preview/fedora/dependabot/Dockerfile
index 9d34e85eb..2b4d6bd3e 100644
--- a/release/preview/fedora28/dependabot/Dockerfile
+++ b/release/preview/fedora/dependabot/Dockerfile
@@ -3,4 +3,4 @@
 
 # Dummy docker image to trigger dependabot PRs
 
-FROM fedora:28
+FROM fedora:30
diff --git a/release/preview/fedora28/docker/Dockerfile b/release/preview/fedora/docker/Dockerfile
similarity index 100%
rename from release/preview/fedora28/docker/Dockerfile
rename to release/preview/fedora/docker/Dockerfile
diff --git a/release/preview/fedora28/getLatestTag.ps1 b/release/preview/fedora/getLatestTag.ps1
similarity index 89%
rename from release/preview/fedora28/getLatestTag.ps1
rename to release/preview/fedora/getLatestTag.ps1
index 5e8290dce..43a61d207 100644
--- a/release/preview/fedora28/getLatestTag.ps1
+++ b/release/preview/fedora/getLatestTag.ps1
@@ -4,11 +4,11 @@
 # return objects representing the tags we need to base the fedora image on
 
 # The versions of fedora we care about
-$shortTags = @('28')
+$shortTags = @('28','29','30')
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
 $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 "fedora" -FullTagFilter '^28$' -OnlyShortTags
+Get-DockerTags -ShortTags $shortTags -Image "fedora" -FullTagFilter '^\d{2}$' -OnlyShortTags
diff --git a/release/preview/fedora28/meta.json b/release/preview/fedora/meta.json
similarity index 100%
rename from release/preview/fedora28/meta.json
rename to release/preview/fedora/meta.json
diff --git a/release/preview/fedora28/test-deps/docker/Dockerfile b/release/preview/fedora/test-deps/docker/Dockerfile
similarity index 100%
rename from release/preview/fedora28/test-deps/docker/Dockerfile
rename to release/preview/fedora/test-deps/docker/Dockerfile
diff --git a/release/preview/fedora28/test-deps/meta.json b/release/preview/fedora/test-deps/meta.json
similarity index 100%
rename from release/preview/fedora28/test-deps/meta.json
rename to release/preview/fedora/test-deps/meta.json
diff --git a/release/servicing/opensuse423/docker/Dockerfile b/release/servicing/opensuse423/docker/Dockerfile
index 76ee2ab8c..1166fddb8 100644
--- a/release/servicing/opensuse423/docker/Dockerfile
+++ b/release/servicing/opensuse423/docker/Dockerfile
@@ -5,7 +5,7 @@
 
 # Define arg(s) needed for the From statement
 ARG fromTag=42.3
-ARG imageRepo=opensuse
+ARG imageRepo=opensuse/leap
 
 FROM ${imageRepo}:${fromTag} AS installer-env
 
diff --git a/release/servicing/opensuse423/getLatestTag.ps1 b/release/servicing/opensuse423/getLatestTag.ps1
index 3e41995f3..9d3cfb58f 100644
--- a/release/servicing/opensuse423/getLatestTag.ps1
+++ b/release/servicing/opensuse423/getLatestTag.ps1
@@ -11,4 +11,4 @@ $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 "opensuse" -FullTagFilter '^42.3$' -OnlyShortTags
+Get-DockerTags -ShortTags $shortTags -Image "opensuse/leap" -FullTagFilter '^42\.3$' -OnlyShortTags
diff --git a/release/servicing/opensuse423/meta.json b/release/servicing/opensuse423/meta.json
index 16cc7c145..d4231e0cd 100644
--- a/release/servicing/opensuse423/meta.json
+++ b/release/servicing/opensuse423/meta.json
@@ -6,5 +6,8 @@
     "SkipGssNtlmSspTests": true,
     "tagTemplates": [
         "#psversion#-opensuse-#tag#"
-    ]
+    ],
+    "TestProperties": {
+        "size": 524
+    }
 }
diff --git a/tools/getDockerTags/getDockerTags.psm1 b/tools/getDockerTags/getDockerTags.psm1
index 6e0e3fd1a..65d82936b 100644
--- a/tools/getDockerTags/getDockerTags.psm1
+++ b/tools/getDockerTags/getDockerTags.psm1
@@ -106,7 +106,7 @@ function Get-DockerTags
 
     if(!$tags)
     {
-        throw 'no results'
+        throw 'no results: '+$Image
     }
 
     foreach($shortTag in $ShortTags)
diff --git a/vsts-ci.yml b/vsts-ci.yml
index 4d4b231f7..c19ca0c29 100644
--- a/vsts-ci.yml
+++ b/vsts-ci.yml
@@ -38,11 +38,19 @@ jobs:
     name: centos7
     imagename: centos7
 
+- template: .vsts-ci/phase.yml
+  parameters:
+    name: fedora
+    imagename: fedora
+    stable: false
+    preview: true
+
 - template: .vsts-ci/phase.yml
   parameters:
     name: fedora28
     imagename: fedora28
     stable: true
+    preview: false
 
 - template: .vsts-ci/phase.yml
   parameters: