diff --git a/README.md b/README.md
index 21b62c74..d5a61602 100644
--- a/README.md
+++ b/README.md
@@ -21,11 +21,8 @@ runs:
       run: echo "do some initial setup"
     - name: Step 2
       shell: bash
-      run: |
-        # note that it's not possible to use if: on the step, see https://github.com/actions/runner/issues/834
-        if [[ "${{ matrix.os }}" == "ubuntu" ]]; then
-          echo "do some Linux-specific setup"
-        fi
+      run: echo "do some Linux-specific setup"
+      if: ${{ matrix.os == 'ubuntu' }}
 ```
 
 These setup steps are run after the repository has been checked out and after Go has been installed, but before any tests or checks are run.
diff --git a/config.json b/config.json
index 4fe21521..698a0127 100644
--- a/config.json
+++ b/config.json
@@ -5,6 +5,7 @@
   { "target": "filecoin-project/go-fil-commp-hashhash" },
   { "target": "filecoin-project/go-hamt-ipld" },
   { "target": "filecoin-project/go-indexer-core" },
+  { "target": "filecoin-project/go-legs" },
   { "target": "filecoin-project/indexer-reference-provider" },
   { "target": "filecoin-project/storetheindex" },
   { "target": "filecoin-shipyard/js-lotus-client-schema" },
@@ -34,6 +35,7 @@
   { "target": "ipfs/go-ds-pebble" },
   { "target": "ipfs/go-ds-redis" },
   { "target": "ipfs/go-ds-s3" },
+  { "target": "ipfs/go-ds-sql" },
   { "target": "ipfs/go-fetcher", "deploy_versioning": true },
   { "target": "ipfs/go-filestore", "deploy_versioning": true },
   { "target": "ipfs/go-fs-lock" },
@@ -85,7 +87,7 @@
   { "target": "ipfs/iptb" },
   { "target": "ipfs/iptb-plugins" },
   { "target": "ipfs/pinbot-irc" },
-  { "target": "ipfs/tar-utils" },
+  { "target": "ipfs/tar-utils", "deploy_versioning": true },
   { "target": "ipld/codec-fixtures" },
   { "target": "ipld/go-car", "deploy_versioning": true },
   { "target": "ipld/go-codec-dagpb" },
diff --git a/templates/.github/workflows/go-test.yml b/templates/.github/workflows/go-test.yml
index 8f432f14..01294752 100644
--- a/templates/.github/workflows/go-test.yml
+++ b/templates/.github/workflows/go-test.yml
@@ -23,6 +23,14 @@ jobs:
         run: |
           go version
           go env
+      - name: Use msys2 on windows
+        if: ${{ matrix.os == 'windows' }}
+        shell: bash
+        # The executable for msys2 is also called bash.cmd
+        #   https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md#shells
+        # If we prepend its location to the PATH
+        #   subsequent 'shell: bash' steps will use msys2 instead of gitbash
+        run: echo "C:/msys64/usr/bin" >> $GITHUB_PATH
       - name: Run repo-specific setup
         uses: ./.github/actions/go-test-setup
         if: hashFiles('./.github/actions/go-test-setup') != ''