diff --git a/images/win/post-generation/Choco.ps1 b/images/win/post-generation/Choco.ps1
index 3f8e7c8df..0c7566efd 100644
--- a/images/win/post-generation/Choco.ps1
+++ b/images/win/post-generation/Choco.ps1
@@ -1,2 +1,5 @@
-# Step to avoid initial delay for choco scripts
-choco upgrade chocolatey
\ No newline at end of file
+# Step to avoid initial delay for choco scripts.
+# On calling the first choco command
+# Chocolatey spends 2 minutes cleaning up and removing unneeded packages in the environment.
+$ChocoVersion = choco --version
+choco upgrade chocolatey --version=$ChocoVersion