diff --git a/.github/workflows/dashboards-observability-test-and-build-workflow.yml b/.github/workflows/dashboards-observability-test-and-build-workflow.yml
index 6137b05f6..f8b9f70b4 100644
--- a/.github/workflows/dashboards-observability-test-and-build-workflow.yml
+++ b/.github/workflows/dashboards-observability-test-and-build-workflow.yml
@@ -11,8 +11,11 @@ env:
 jobs:
 
   build:
-
-    runs-on: ubuntu-latest
+    strategy: 
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout Plugin
@@ -57,13 +60,13 @@ jobs:
           yarn test --coverage
 
       - name: Upload coverage
+        if: ${{ matrix.os == 'ubuntu-latest' }}
         uses: codecov/codecov-action@v1
         with:
           flags: dashboards-observability
           directory: ./OpenSearch-Dashboards/plugins/dashboards-observability
           token: ${{ secrets.CODECOV_TOKEN }}
 
-      # TODO remove hard coded version when observability is ready
       - name: Build Artifact
         run: |
           cd OpenSearch-Dashboards/plugins/dashboards-observability
@@ -73,6 +76,5 @@ jobs:
       - name: Upload Artifact
         uses: actions/upload-artifact@v1
         with:
-          name: dashboards-observability
-          path: ./OpenSearch-Dashboards/plugins/dashboards-observability/build
-
+          name: dashboards-observability-${{ matrix.os }}
+          path: ./OpenSearch-Dashboards/plugins/dashboards-observability/build
\ No newline at end of file
diff --git a/.github/workflows/opensearch-observability-test-and-build-workflow.yml b/.github/workflows/opensearch-observability-test-and-build-workflow.yml
index 3b3c62f67..157c3a822 100644
--- a/.github/workflows/opensearch-observability-test-and-build-workflow.yml
+++ b/.github/workflows/opensearch-observability-test-and-build-workflow.yml
@@ -9,14 +9,18 @@ env:
 
 jobs:
   build:
+    env:
+      BUILD_ARGS: ${{ matrix.os_build_args }}
     strategy:
       matrix:
-        java:
-          - 8
-          - 11
-          - 14
-
-    runs-on: ubuntu-latest
+        java: [8, 11]
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        include:
+          - os: windows-latest
+            os_build_args: -x integTest -x jacocoTestReport
+          - os: macos-latest
+            os_build_args: -x integTest -x jacocoTestReport
+    runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v1
@@ -27,6 +31,8 @@ jobs:
           java-version: ${{ matrix.java }}
     
       - name: Run Backwards Compatibility Tests
+        # Temporarily only do this for linux
+        if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
           cd opensearch-observability
           echo "Running backwards compatibility tests ..."
@@ -35,9 +41,10 @@ jobs:
       - name: Build with Gradle
         run: |
           cd opensearch-observability
-          ./gradlew build -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
+          ./gradlew build ${{ env.BUILD_ARGS }}
 
       - name: Upload coverage
+        if: ${{ matrix.os == 'ubuntu-latest' }}
         uses: codecov/codecov-action@v1
         with:
           flags: opensearch-observability
@@ -52,5 +59,5 @@ jobs:
       - name: Upload Artifacts
         uses: actions/upload-artifact@v1
         with:
-          name: opensearch-observability
-          path: opensearch-observability-builds
+          name: opensearch-observability-${{ matrix.os }}
+          path: opensearch-observability-builds
\ No newline at end of file
diff --git a/dashboards-observability/public/components/explorer/no_results.tsx b/dashboards-observability/public/components/explorer/no_results.tsx
index 802099729..91cc8ab62 100644
--- a/dashboards-observability/public/components/explorer/no_results.tsx
+++ b/dashboards-observability/public/components/explorer/no_results.tsx
@@ -38,8 +38,7 @@ export const NoResults = () => {
                 <p>
                   <FormattedMessage
                     id="discover.noResults.queryMayNotMatchTitle"
-                    defaultMessage="Your query may not match anything in the current time range, or there may not be any data at all in
-                    the currently selected time range. Try change time range, query filters or choose different time fields"
+                    defaultMessage="Your query may not match anything in the current time range, or there may not be any data at all in the currently selected time range. Try change time range, query filters or choose different time fields"
                   />
                 </p>
               </EuiText>