diff --git a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/DockerFile b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/DockerFile
index 110d5bc4995..c8be0a943e4 100644
--- a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/DockerFile
+++ b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/DockerFile
@@ -1,10 +1,10 @@
 # escape=`
 #0.3.6 (no powershell 6)
-FROM microsoft/windowsservercore
+FROM microsoft/powershell:windowsservercore
 LABEL maintainer='PowerShell Team <powershellteam@hotmail.com>'
 LABEL description="This Dockerfile for Windows Server Core with git installed via chocolatey."
 
-SHELL ["C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe", "-command"]
+SHELL ["C:\\Program Files\\PowerShell\\latest\\pwsh.exe", "-command"]
 # Install Git, and NuGet
 # Git installs to C:\Program Files\Git
 # nuget installs to C:\ProgramData\chocolatey\bin\NuGet.exe
@@ -21,8 +21,4 @@ RUN Import-Module ./containerFiles/wix.psm1; `
 
 COPY PowerShellPackage.ps1 /
 
-ADD https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.ps1 \install-powershell.ps1
-RUN new-item -Path 'C:\Program Files\PowerShell\latest' -ItemType Directory; `
-    \install-powershell.ps1 -AddToPath -Destination 'C:\Program Files\PowerShell\latest'
-
 ENTRYPOINT ["C:\\Program Files\\PowerShell\\latest\\pwsh.exe", "-command"]