diff --git a/containers/agent-windows-jenkins/VERSION b/containers/agent-windows-jenkins/VERSION
index c7250cb..00b30ed 100644
Binary files a/containers/agent-windows-jenkins/VERSION and b/containers/agent-windows-jenkins/VERSION differ
diff --git a/containers/agent-windows/VERSION b/containers/agent-windows/VERSION
index c7250cb..00b30ed 100644
Binary files a/containers/agent-windows/VERSION and b/containers/agent-windows/VERSION differ
diff --git a/containers/build_deploy.ps1 b/containers/build_deploy.ps1
index 6d34732..8c0608d 100644
--- a/containers/build_deploy.ps1
+++ b/containers/build_deploy.ps1
@@ -37,23 +37,31 @@ $container_version+=1
 $agent_windows_version=Get-Content "../agent-windows/$VERSION_FILE"
 
 Write-Host "Building ${IMAGE_NAME}:${container_version}..."
-Write-Host "Using windows-agent:${agent_windows_version}"
+Write-Host "Using windows-agent ${agent_windows_version}"
 
 # TODO: get current Windows version number from host via "cmd /c ver"
 # to solve these issues: https://stackoverflow.com/questions/43123851/unable-to-run-cygwin-in-windows-docker-container/52273489#52273489
 $windows_version="10.0.17763.1039"
+Write-Host "Using windows version ${windows_version}"
 
 Invoke-Call -ScriptBlock {
     docker build . `
         -t ${IMAGE_NAME}:${container_version} `
+        -t ${IMAGE_NAME}:latest `
         --build-arg windows_version=$windows_version `
         --build-arg agent_windows_version=$agent_windows_version
     }
 Invoke-Call -ScriptBlock {
     docker tag ${IMAGE_NAME}:${container_version} ${QUALIFIED_NAME}:${container_version}
 }
+Invoke-Call -ScriptBlock {
+    docker tag ${IMAGE_NAME}:latest ${QUALIFIED_NAME}:latest
+}
 Invoke-Call -ScriptBlock {
     docker push ${QUALIFIED_NAME}:$container_version
 }
+Invoke-Call -ScriptBlock {
+    docker push ${QUALIFIED_NAME}:latest
+}
 $container_version | Out-File $VERSION_FILE
 Pop-Location
\ No newline at end of file