diff --git a/travis/deploy_master.sh b/travis/deploy_master.sh
index 65a159b..a0a4483 100644
--- a/travis/deploy_master.sh
+++ b/travis/deploy_master.sh
@@ -19,11 +19,7 @@ echo "TRAVIS_CPU_ARCH_STANDARD: $TRAVIS_CPU_ARCH_STANDARD"
 
 # Setup ssh
 mkdir -p ~/.ssh
-if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then 
-    echo "$GIT_IGN_TRAVIS_DEPLOY_PRIVATE_KEY" | base64.exe -d > ~/.ssh/id_rsa
-else
-    echo "$GIT_IGN_TRAVIS_DEPLOY_PRIVATE_KEY" | base64 -d > ~/.ssh/id_rsa
-fi
+echo "$GIT_IGN_TRAVIS_DEPLOY_PRIVATE_KEY" | base64 -d > ~/.ssh/id_rsa
 chmod 600 ~/.ssh/id_rsa || true
 ssh-keyscan ssh.git.ignuranza.net >> $HOME/.ssh/known_hosts
 ssh-keyscan git.ignuranza.net >> $HOME/.ssh/known_hosts
@@ -39,19 +35,15 @@ if [ "$TRAVIS_OS_NAME_STANDARD" = "windows" ]; then
     mkdir -p "src/main/resources/libs/$TRAVIS_OS_NAME_STANDARD/$TRAVIS_CPU_ARCH_STANDARD"
     mv "$TRAVIS_BUILD_DIR/out/libtdjni.dll" "src/main/resources/libs/$TRAVIS_OS_NAME_STANDARD/$TRAVIS_CPU_ARCH_STANDARD/tdjni.dll"
     git add "src/main/resources/libs/$TRAVIS_OS_NAME_STANDARD/$TRAVIS_CPU_ARCH_STANDARD/tdjni.dll"
-    /c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3-bin/bin/mvn.cmd build-helper:parse-version versions:set \
-    -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} \
-    versions:commit
-    NEW_VERSION=$(/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3-bin/bin/mvn.cmd help:evaluate -Dexpression=project.version -q -DforceStdout)
 else
     mkdir -p "src/main/resources/libs/$TRAVIS_OS_NAME_STANDARD/$TRAVIS_CPU_ARCH_STANDARD"
     mv "$TRAVIS_BUILD_DIR/out/libtdjni.so" "src/main/resources/libs/$TRAVIS_OS_NAME_STANDARD/$TRAVIS_CPU_ARCH_STANDARD/tdjni.so"
     git add "src/main/resources/libs/$TRAVIS_OS_NAME_STANDARD/$TRAVIS_CPU_ARCH_STANDARD/tdjni.so"
-    mvn build-helper:parse-version versions:set \
-    -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} \
-    versions:commit
-    NEW_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
 fi
+mvn build-helper:parse-version versions:set \
+-DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} \
+versions:commit
+NEW_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
 git add pom.xml
 git commit -m "Updated native library"
 git tag -a "v$NEW_VERSION" -m "Version $NEW_VERSION"
diff --git a/travis/win.sh b/travis/win.sh
index bd765b2..29e380d 100644
--- a/travis/win.sh
+++ b/travis/win.sh
@@ -4,15 +4,7 @@ mkdir $TRAVIS_BUILD_DIR/out
 
 # Build deps
 choco install openjdk11
-choco install maven
-
-echo $M2_HOME
-ls -alch /c/ProgramData/chocolatey/lib
-ls -alch /c/ProgramData/chocolatey/lib/maven
-ls -alch /c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3-bin
-ls -alch /c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3-bin/bin
-ls -alch /c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3-bin/bin/mvn.cmd
-
+choco install maven --version=3.6.3
 choco install base64
 
 touch "$TRAVIS_BUILD_DIR/out/libtdjni.dll"
@@ -23,7 +15,7 @@ choco install gperf
 choco install strawberryperl 
 
 # Setup variables
-export PATH=$PATH:/c/ProgramData/chocolatey/lib/maven/bin:/c/ProgramData/chocolatey/lib/base64/tools
+export PATH=$PATH:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/base64/tools
 # End setup variables
 
 cd $TRAVIS_BUILD_DIR