diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1
index 7d5e18a4..71dbd6cf 100644
--- a/images/win/scripts/Installers/Install-Docker.ps1
+++ b/images/win/scripts/Installers/Install-Docker.ps1
@@ -5,24 +5,25 @@
 ##         can continue.
 ################################################################################
 
-# Docker EE 20.10.8 has the regression
-# fatal: open C:\ProgramData\docker\panic.log: Access is denied.
-Write-Host "Install-Package Docker"
-Install-Package -Name docker -ProviderName DockerMsftProvider -RequiredVersion 20.10.7 -Force
-Start-Service docker
+Write-Host "Install Docker CE"
+$instScriptUrl = "https://raw.githubusercontent.com/microsoft/Windows-Containers/Main/helpful_tools/Install-DockerCE/install-docker-ce.ps1"
+$instScriptPath = Start-DownloadWithRetry -Url $instScriptUrl -Name "install-docker-ce.ps1"
+& $instScriptPath
 
 Write-Host "Install-Package Docker-Compose v1"
 Choco-Install -PackageName docker-compose
 
 Write-Host "Install-Package Docker-Compose v2"
 $dockerComposev2Url = "https://github.com/docker/compose/releases/latest/download/docker-compose-windows-x86_64.exe"
-Start-DownloadWithRetry -Url $dockerComposev2Url -Name docker-compose.exe -DownloadPath "C:\Program Files\Docker\cli-plugins"
+$cliPluginsDir = "C:\ProgramData\docker\cli-plugins"
+New-Item -Path $cliPluginsDir -ItemType Directory
+Start-DownloadWithRetry -Url $dockerComposev2Url -Name docker-compose.exe -DownloadPath $cliPluginsDir
 
 Write-Host "Install docker-wincred"
 $dockerCredLatestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/docker/docker-credential-helpers/releases/latest"
 $dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.zip" | Select-Object -First 1
 $dockerCredArchive = Start-DownloadWithRetry -Url $dockerCredDownloadUrl
-Expand-Archive -Path $dockerCredArchive -DestinationPath "C:\Program Files\Docker"
+Expand-Archive -Path $dockerCredArchive -DestinationPath "C:\Windows\System32"
 
 Write-Host "Download docker images"
 $dockerImages = (Get-ToolsetContent).docker.images
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1
index 1318d727..0e366bd1 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1
@@ -122,7 +122,7 @@ function Test-BlankElement {
 
     $splitByLines = $Markdown.Split("`n")
     # Validate entry without version
-    $blankVersions = $splitByLines -match "^-" -notmatch "(OS|Image) Version|WSL|Vcpkg|\d\." | Out-String
+    $blankVersions = $splitByLines -match "^-" -notmatch "(OS|Image) Version|WSL|Vcpkg|Docker|\d\." | Out-String
 
     # Validate tables with blank rows
     $blankRows = ""