diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e0462ffe4c..5d56aa3623 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,10 +82,6 @@ jobs:
       run: echo "##[set-output name=branch;]${GITHUB_REF#refs/heads/}"
       id: extract_branch
 
-    - name: Upgrade pip
-      run: |
-        python -m pip install --upgrade pip
-
     - name: Build on Unix
       if: runner.os != 'Windows'
       env:
diff --git a/.github/workflows/ci/build.cmd b/.github/workflows/ci/build.cmd
index 3d204a7799..bcd6ea1ce6 100644
--- a/.github/workflows/ci/build.cmd
+++ b/.github/workflows/ci/build.cmd
@@ -1,5 +1,9 @@
+:: Set the correct Python PATH
+set PATH=%HUNTER_PYTHON_LOCATION%;%PATH%
+
 :: Install Python package 'requests'
-pip install requests gitpython
+python -m pip install --upgrade pip
+python -m pip install requests gitpython
 
 :: Install latest Polly toolchains and scripts
 C:\msys64\usr\bin\wget.exe https://github.com/cpp-pm/polly/archive/master.zip
diff --git a/.github/workflows/ci/build.sh b/.github/workflows/ci/build.sh
index 24af6e129e..11f16f6807 100644
--- a/.github/workflows/ci/build.sh
+++ b/.github/workflows/ci/build.sh
@@ -1,5 +1,9 @@
+# Set the correct Python PATH
+export PATH="${HUNTER_PYTHON_LOCATION}:${PATH}"
+
 # Install Python package 'requests'
-pip install requests gitpython
+python -m pip install --upgrade pip
+python -m pip install requests gitpython
 
 # Install latest Polly toolchains and scripts
 wget https://github.com/cpp-pm/polly/archive/master.zip
diff --git a/cmake/projects/draco/hunter.cmake b/cmake/projects/draco/hunter.cmake
index c016d5b189..6b0932848a 100644
--- a/cmake/projects/draco/hunter.cmake
+++ b/cmake/projects/draco/hunter.cmake
@@ -5,6 +5,7 @@
 
 include(hunter_add_version)
 include(hunter_cacheable)
+include(hunter_cmake_args)
 include(hunter_download)
 include(hunter_pick_scheme)
 
@@ -30,6 +31,15 @@ hunter_add_version(
     1c37aba7278d7b8c729a98cc429d867626fa085c
 )
 
+hunter_cmake_args(
+    draco
+    CMAKE_ARGS
+        DRACO_GLTF=ON
+        DRACO_UNITY_PLUGIN=OFF
+        DRACO_MAYA_PLUGIN=OFF
+        DRACO_TESTS=OFF
+)
+
 hunter_pick_scheme(DEFAULT url_sha1_cmake)
 hunter_cacheable(draco)
 hunter_download(PACKAGE_NAME draco)