diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 749e13d5..e915c783 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -19,7 +19,7 @@ steps:
   - script: |
       choco install wget --no-progress
       wget -q https://download.java.net/java/GA/jdk16.0.2/d4a915d82b4c4fbb9bde534da945d746/7/GPL/openjdk-16.0.2_windows-x64_bin.zip -O openjdk-16.0.2_windows-x64_bin.zip
-      unzip openjdk-16.0.2_windows-x64_bin.zip
+      7z.exe x openjdk-16.0.2_windows-x64_bin.zip
       setx JAVA_HOME jdk-16.0.2
       call refreshenv
       call mvn -X clean package -Dexec.skip=true --no-transfer-progress $(MAVEN_OPTS)
diff --git a/build_binaries.yml b/build_binaries.yml
index 11084397..c63624e3 100644
--- a/build_binaries.yml
+++ b/build_binaries.yml
@@ -88,7 +88,7 @@ jobs:
         choco install 7zip --no-progress
         choco install wget --no-progress
         wget -q https://download.java.net/java/GA/jdk16.0.2/d4a915d82b4c4fbb9bde534da945d746/7/GPL/openjdk-16.0.2_windows-x64_bin.zip -O openjdk-16.0.2_windows-x64_bin.zip
-        unzip openjdk-16.0.2_windows-x64_bin.zip
+        7z.exe x openjdk-16.0.2_windows-x64_bin.zip
         setx JAVA_HOME jdk-16.0.2
         call refreshenv
         wget -q https://gluonhq.com/download/javafx-16-jmods-windows/ -O openjfx-16_windows-x64_bin-jmods.zip
diff --git a/release-all.yml b/release-all.yml
index a62a2f2a..aac85ccb 100644
--- a/release-all.yml
+++ b/release-all.yml
@@ -91,10 +91,10 @@ jobs:
         choco install 7zip --no-progress
         choco install wget --no-progress
         wget -q https://download.java.net/java/GA/jdk16.0.2/d4a915d82b4c4fbb9bde534da945d746/7/GPL/openjdk-16.0.2_windows-x64_bin.zip -O openjdk-16.0.2_windows-x64_bin.zip
-        unzip openjdk-16.0.2_windows-x64_bin.zip
+        7z.exe x openjdk-16.0.2_windows-x64_bin.zip
         setx JAVA_HOME jdk-16.0.2
         call refreshenv
-        wget -q https://gluonhq.com/download/javafx-16-jmods-windows/ -O openjfx-16_windows-x64_bin-jmods.zip
+        wget https://gluonhq.com/download/javafx-16-jmods-windows/ -O openjfx-16_windows-x64_bin-jmods.zip
         7z.exe x openjfx-16_windows-x64_bin-jmods.zip
         SET JAVAFX_JMODS=javafx-jmods-16