diff --git a/Jenkinsfile b/Jenkinsfile
index 476e498da..f92082c10 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -167,9 +167,6 @@ pipeline {
           post {
             always {
               junit(allowEmptyResults: true, keepLongStdio: true, testResults: "${BASE_DIR}/build/junit-*.xml")
-              dir("${BASE_DIR}"){
-                bat script: 'scripts/jenkins/windows/uninstall-tools.bat', label: 'Uninstall tools'
-              }
               cleanWs(disableDeferredWipeout: true, notFailBuild: true)
             }
           }
diff --git a/scripts/jenkins/windows/install-tools.bat b/scripts/jenkins/windows/install-tools.bat
index b0ba98683..d13ccc4cc 100755
--- a/scripts/jenkins/windows/install-tools.bat
+++ b/scripts/jenkins/windows/install-tools.bat
@@ -3,4 +3,7 @@
 ::
 
 choco config set cacheLocation %WORKSPACE%
-choco install golang --version %GO_VERSION% -y --no-progress
+:: Install latest as long as https://github.com/chocolatey/chocolatey.org/issues/803
+:: is not resolved.
+:: choco install golang --version %GO_VERSION% -y --no-progress
+choco install golang -y --no-progress
diff --git a/scripts/jenkins/windows/uninstall-tools.bat b/scripts/jenkins/windows/uninstall-tools.bat
deleted file mode 100755
index 05214be7d..000000000
--- a/scripts/jenkins/windows/uninstall-tools.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-::
-:: This script install the required tools
-::
-
-choco uninstall golang --version %GO_VERSION% -y