diff --git a/.github/actions/install-dashboards/action.yml b/.github/actions/install-dashboards/action.yml
index 18721933d..7dae184e8 100644
--- a/.github/actions/install-dashboards/action.yml
+++ b/.github/actions/install-dashboards/action.yml
@@ -78,6 +78,8 @@ runs:
       working-directory: OpenSearch-Dashboards
       shell: bash
 
-    - run: yarn osd bootstrap --oss
-      working-directory: OpenSearch-Dashboards
-      shell: bash
+    - uses: nick-fields/retry@v2
+      with:
+        timeout_minutes: 20
+        max_attempts: 2
+        command: yarn --cwd OpenSearch-Dashboards osd bootstrap --oss
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index d80034b67..63c5feb57 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -8,10 +8,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-latest ]
+        os: [ ubuntu-latest , windows-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Enable longer filenames
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: git config --system core.longpaths true
+
       - uses: actions/checkout@v2
 
       - id: install-dashboards