diff --git a/tests/agent.Tests.ps1 b/tests/agent.Tests.ps1
index ed196dce1..7c214fd21 100644
--- a/tests/agent.Tests.ps1
+++ b/tests/agent.Tests.ps1
@@ -28,7 +28,7 @@ if ($global:WINDOWSFLAVOR -eq 'nanoserver') {
     $global:CONTAINERSHELL = 'pwsh.exe'
 }
 
-$global:GITLFSVERSION = '3.5.1'
+$global:GITLFSVERSION = '3.6.0'
 
 # # Uncomment to help debugging when working on this script
 # Write-Host "= DEBUG: global vars"
diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
index 8db58ac7f..a6e8336cb 100644
--- a/windows/nanoserver/Dockerfile
+++ b/windows/nanoserver/Dockerfile
@@ -72,7 +72,7 @@ ENV ProgramFiles="C:\Program Files" `
     JAVA_HOME="${JAVA_HOME}"
 ENV PATH="${WindowsPATH};${ProgramFiles}\PowerShell;${JAVA_HOME}\bin;C:\mingit\cmd"
 
-ARG GIT_LFS_VERSION=3.5.1
+ARG GIT_LFS_VERSION=3.6.0
 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
     $url = $('https://github.com/git-lfs/git-lfs/releases/download/v{0}/git-lfs-windows-amd64-v{0}.zip' -f $env:GIT_LFS_VERSION) ; `
     Write-Host "Retrieving $url..." ; `
diff --git a/windows/windowsservercore/Dockerfile b/windows/windowsservercore/Dockerfile
index 1d22b210e..b9b31500c 100644
--- a/windows/windowsservercore/Dockerfile
+++ b/windows/windowsservercore/Dockerfile
@@ -64,7 +64,7 @@ RUN $CurrentPath = (Get-Itemproperty -path 'hklm:\system\currentcontrolset\contr
     $NewPath = $CurrentPath + $(';{0}\bin;C:\mingit\cmd' -f $env:JAVA_HOME) ; `
     Set-ItemProperty -path 'hklm:\system\currentcontrolset\control\session manager\environment' -Name Path -Value $NewPath
 
-ARG GIT_LFS_VERSION=3.5.1
+ARG GIT_LFS_VERSION=3.6.0
 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
     $url = $('https://github.com/git-lfs/git-lfs/releases/download/v{0}/git-lfs-windows-amd64-v{0}.zip' -f $env:GIT_LFS_VERSION) ; `
     Write-Host "Retrieving $url..." ; `