diff --git a/containers/agent-windows-buildkite/Dockerfile b/containers/agent-windows-buildkite/Dockerfile
index 813ebcf..20daafd 100644
--- a/containers/agent-windows-buildkite/Dockerfile
+++ b/containers/agent-windows-buildkite/Dockerfile
@@ -8,8 +8,8 @@ FROM gcr.io/llvm-premerge-checks/agent-windows
 # Supply your agent token via the arguement "-token <mytoken" when building the image
 ARG token
 ENV buildkiteAgentToken="${token}"
-ENV BUILDKITE_BUILD_PATH=C:\workspace\buildkite
-ENV BUILDKITE_AGENT_NAME=amd64-windows-visualstudio2017
+ENV BUILDKITE_BUILD_PATH=C:\ws\bk
+ENV BUILDKITE_AGENT_NAME=win-vs17
 
 RUN powershell -NoProfile -InputFormat None -Command `
     Set-ExecutionPolicy Bypass -Scope Process -Force ; `
diff --git a/containers/agent-windows/Dockerfile b/containers/agent-windows/Dockerfile
index c9d77a3..900dca1 100644
--- a/containers/agent-windows/Dockerfile
+++ b/containers/agent-windows/Dockerfile
@@ -32,8 +32,8 @@ ENV PYTHONIOENCODING=UTF-8
 RUN powershell.exe -Command $path = $env:path + ';c:\Program Files (x86)\GnuWin32\bin;C:\Program Files\CMake\bin'; Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $path
 
 # use this folder to store the worksapce'
-VOLUME C:\workspace
-WORKDIR C:\workspace
+VOLUME C:\ws
+WORKDIR C:\ws
 
 # support long file names during git checkout
 RUN git config --system core.longpaths true & `
diff --git a/containers/build_run.ps1 b/containers/build_run.ps1
index b9464ed..72787c3 100644
--- a/containers/build_run.ps1
+++ b/containers/build_run.ps1
@@ -29,7 +29,7 @@ If ($LastExitCode -ne 0) {
 
 # mount a persistent workspace for experiments
 New-Item -ItemType Directory -Force -Path $Env:USERPROFILE\workspace
-docker run -it -v $Env:USERPROFILE\workspace:C:\workspace $IMAGE_NAME
+docker run -it -v $Env:USERPROFILE\workspace:C:\ws $IMAGE_NAME
 If ($LastExitCode -ne 0) {
     exit
 }
\ No newline at end of file