diff --git a/release/preview/nanoserver/docker/Dockerfile b/release/preview/nanoserver/docker/Dockerfile
index 51f970be0..50496e558 100755
--- a/release/preview/nanoserver/docker/Dockerfile
+++ b/release/preview/nanoserver/docker/Dockerfile
@@ -70,7 +70,7 @@ ENV ProgramFiles="C:\Program Files" `
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
 
 # Set the path
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell"
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;"
 
 # intialize powershell module cache
 RUN pwsh `
diff --git a/release/preview/nanoserver1809/docker/Dockerfile b/release/preview/nanoserver1809/docker/Dockerfile
index 6efb23d27..1b379bc2e 100755
--- a/release/preview/nanoserver1809/docker/Dockerfile
+++ b/release/preview/nanoserver1809/docker/Dockerfile
@@ -70,7 +70,7 @@ ENV ProgramFiles="C:\Program Files" `
     WindowsPATH="C:\Windows\system32;C:\Windows"
 
     # Set the path
-ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell"
+ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell;"
 
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
 
diff --git a/release/preview/windowsservercore/docker/Dockerfile b/release/preview/windowsservercore/docker/Dockerfile
index b9db4cbe6..49297cc9c 100755
--- a/release/preview/windowsservercore/docker/Dockerfile
+++ b/release/preview/windowsservercore/docker/Dockerfile
@@ -45,7 +45,7 @@ ENV ProgramFiles="C:\Program Files" `
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
 
 # Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%"
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
 
 # intialize powershell module cache
 RUN pwsh `
diff --git a/release/servicing/nanoserver/docker/Dockerfile b/release/servicing/nanoserver/docker/Dockerfile
index 5f4fd3861..03052208e 100755
--- a/release/servicing/nanoserver/docker/Dockerfile
+++ b/release/servicing/nanoserver/docker/Dockerfile
@@ -70,7 +70,7 @@ ENV ProgramFiles="C:\Program Files" `
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
 
 # Set the path
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell"
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;"
 
 # intialize powershell module cache
 RUN pwsh `
diff --git a/release/servicing/nanoserver1809/docker/Dockerfile b/release/servicing/nanoserver1809/docker/Dockerfile
index b1e12b00d..5721e50cc 100755
--- a/release/servicing/nanoserver1809/docker/Dockerfile
+++ b/release/servicing/nanoserver1809/docker/Dockerfile
@@ -70,7 +70,7 @@ ENV ProgramFiles="C:\Program Files" `
     WindowsPATH="C:\Windows\system32;C:\Windows"
 
     # Set the path
-ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell"
+ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell;"
 
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
 
diff --git a/release/servicing/windowsservercore/docker/Dockerfile b/release/servicing/windowsservercore/docker/Dockerfile
index 700ec32e0..7b1e26dfe 100755
--- a/release/servicing/windowsservercore/docker/Dockerfile
+++ b/release/servicing/windowsservercore/docker/Dockerfile
@@ -45,7 +45,7 @@ ENV ProgramFiles="C:\Program Files" `
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
 
 # Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%"
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
 
 # intialize powershell module cache
 RUN pwsh `
diff --git a/release/stable/nanoserver/docker/Dockerfile b/release/stable/nanoserver/docker/Dockerfile
index aaefaeaf7..50a7b3bf2 100755
--- a/release/stable/nanoserver/docker/Dockerfile
+++ b/release/stable/nanoserver/docker/Dockerfile
@@ -70,7 +70,7 @@ ENV ProgramFiles="C:\Program Files" `
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
 
 # Set the path
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell"
+RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell;"
 
 # intialize powershell module cache
 RUN pwsh `
diff --git a/release/stable/nanoserver1809/docker/Dockerfile b/release/stable/nanoserver1809/docker/Dockerfile
index e79e14495..cb72f754c 100755
--- a/release/stable/nanoserver1809/docker/Dockerfile
+++ b/release/stable/nanoserver1809/docker/Dockerfile
@@ -70,7 +70,7 @@ ENV ProgramFiles="C:\Program Files" `
     WindowsPATH="C:\Windows\system32;C:\Windows"
 
     # Set the path
-ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell"
+ENV PATH="$WindowsPATH;${ProgramFiles}\PowerShell;"
 
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
 
diff --git a/release/stable/windowsservercore/docker/Dockerfile b/release/stable/windowsservercore/docker/Dockerfile
index 227af8093..6909666ae 100755
--- a/release/stable/windowsservercore/docker/Dockerfile
+++ b/release/stable/windowsservercore/docker/Dockerfile
@@ -45,7 +45,7 @@ ENV ProgramFiles="C:\Program Files" `
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell\\latest"]
 
 # Set the path
-RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%"
+RUN setx /M PATH "%ProgramFiles%\PowerShell\latest;%PATH%;"
 
 # intialize powershell module cache
 RUN pwsh `