diff --git a/Makefile b/Makefile
index 7711757e7bb..f90dfb86fff 100644
--- a/Makefile
+++ b/Makefile
@@ -34,8 +34,8 @@ VERSION ?= latest
 # Use a custom version for E2E tests if we are testing in CI
 ifdef CI
 ifndef PUBLISH
-ifdef TEST_WINDOWS
-override IMAGE_VERSION := e2e-win-$(GIT_COMMIT)
+ifdef WINDOWS_SERVER_VERSION
+override IMAGE_VERSION := e2e-$(WINDOWS_SERVER_VERSION)-$(GIT_COMMIT)
 endif
 ifdef EXTERNAL_E2E_TEST
 override IMAGE_VERSION := e2e-external-$(GIT_COMMIT)
diff --git a/cmd/smbplugin/Dockerfile.Windows b/cmd/smbplugin/Dockerfile.Windows
index b5a753116e4..52114e3d921 100644
--- a/cmd/smbplugin/Dockerfile.Windows
+++ b/cmd/smbplugin/Dockerfile.Windows
@@ -13,11 +13,11 @@
 # limitations under the License.
 
 # these arguments come from BUILD_PLATFORMS used in release-tools
-ARG ADDON_IMAGE=servercore:1809@sha256:6fdf140282a2f809dae9b13fe441635867f0a27c33a438771673b8da8f3348a4
+ARG ADDON_IMAGE=servercore:1809
 ARG BASE_IMAGE=nanoserver:1809
 ARG REGISTRY=mcr.microsoft.com/windows
 
-FROM ${REGISTRY}/${ADDON_IMAGE} as addon
+FROM ${REGISTRY}/${ADDON_IMAGE} AS addon
 FROM ${REGISTRY}/${BASE_IMAGE}
 LABEL description="CSI SMB plugin"