diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9a0364..e85c0fe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,8 +56,8 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2
 
-    - name: Install packages (Ubuntu)
-      if: matrix.os == 'ubuntu-18.04'
+    - name: Install packages (Ubuntu and Windows)
+      if: matrix.os == 'ubuntu-18.04' || matrix.os == 'windows-2019'
       run: |
         ci/ubuntu-install-packages
 
@@ -76,9 +76,7 @@ jobs:
     - name: Use Cross
       if: matrix.target != ''
       run: |
-        # FIXME: to work around bugs in latest cross release, install master.
-        # See: https://github.com/rust-embedded/cross/issues/357
-        cargo install --git https://github.com/rust-embedded/cross
+        cargo install cross
         echo "CARGO=cross" >> $GITHUB_ENV
         echo "TARGET_FLAGS=--target ${{ matrix.target }}" >> $GITHUB_ENV
         echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV