diff --git a/Dockerfile.windows b/Dockerfile.windows
index e9dea88..c51ec33 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -50,7 +50,7 @@ ENV ProgramFiles="C:\Program Files" `
 COPY --from=installer-env ["\\PowerShell\\", "$ProgramFiles\\PowerShell"]
 
 # Set the path
-RUN setx PATH "%PATH%;%ProgramFiles%\PowerShell"
+RUN setx /M PATH "%PATH%;%ProgramFiles%\PowerShell"
 
 # intialize powershell module cache
 RUN pwsh `
diff --git a/build.sh b/build.sh
index 18530b8..7e67548 100755
--- a/build.sh
+++ b/build.sh
@@ -7,5 +7,5 @@ elif [[ $TRAVIS_OS_NAME == 'windows' ]]; then
 fi
 
 docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD"
-docker build -f "$DOCKERFILE" -t exivity/base:latest .
-docker push exivity/base
+docker build -f "$DOCKERFILE" -t exivity/base:$TRAVIS_OS_NAME .
+docker push exivity/base:$TRAVIS_OS_NAME