diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml
index 7002bed4b3..ab2ccc6775 100644
--- a/.github/actions/publish/action.yml
+++ b/.github/actions/publish/action.yml
@@ -39,15 +39,12 @@ runs:
       uses: actions/setup-node@v3
       with:
         node-version: ${{ inputs.NODE_VERSION }}
-        #cache: npm
+        cache: npm
 
-    - name: Install packages
+    - name: Install package(s)
       if: runner.os == 'Windows'
       shell: bash
-      run: |
-        choco install \
-          yq \
-          7zip.install
+      run: choco install yq
 
     # FIXME: resinci-deploy is not actively maintained
     # https://github.com/product-os/resinci-deploy
diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
index adc4d90ba7..633effa8bb 100644
--- a/.github/actions/test/action.yml
+++ b/.github/actions/test/action.yml
@@ -26,7 +26,18 @@ runs:
       uses: actions/setup-node@v3
       with:
         node-version: ${{ inputs.NODE_VERSION }}
-        #cache: npm
+        cache: npm
+
+    - name: Install node-gyp
+      if: runner.os == 'Windows'
+      shell: bash
+      run: |
+        npm install -g node-gyp
+
+        find "$(dirname $(which node))/.." -type f -name node-gyp.js \
+          | xargs -I{} node {} install
+
+        node-gyp --version
 
     - name: Test release
       shell: bash