diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 14b6d74..ffb3d0c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,78 +1,79 @@
 name: Always be deploying
 
 on:
-  pull_request:
-    paths-ignore: 
-      - 'README.md'
-      - '.editorconfig'
-  push:
-    paths-ignore:
-      - 'README.md'
-      - '.editorconfig'
-    branches:
-      - main 
-    tags:
-      - "*.*.*"
+    pull_request:
+        paths-ignore:
+            - 'README.md'
+            - '.editorconfig'
+    push:
+        paths-ignore:
+            - 'README.md'
+            - '.editorconfig'
+        branches:
+            - main
+        tags:
+            - "*.*.*"
 
 jobs:
-  test-windows:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-          fetch-depth: 1
-    - run: |
-          git fetch --prune --unshallow --tags
-          echo exit code $?
-          git tag --list
-    - uses: actions/setup-dotnet@v1
-      with:
-          dotnet-version: |
-              8.0.x
-              6.0.x
-          source-url: https://nuget.pkg.github.com/elastic/index.json
-      env:
-          NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
-    - run: build.bat test
-      shell: cmd
-      name: Test
+    test-windows:
+        runs-on: windows-latest
+        steps:
+            - uses: actions/checkout@v2
+              with:
+                  fetch-depth: 1
+            - run: |
+                  git fetch --prune --unshallow --tags
+                  echo exit code $?
+                  git tag --list
+            - uses: actions/setup-dotnet@v1
+              with:
+                  dotnet-version: |
+                      8.0.x
+                      6.0.x
+                  source-url: https://nuget.pkg.github.com/elastic/index.json
+              env:
+                  NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+            - run: build.bat test
+              shell: cmd
+              name: Test
+    
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+              with:
+                  fetch-depth: 1
+            - run: |
+                  git fetch --prune --unshallow --tags
+                  echo exit code $?
+                  git tag --list
+            - uses: actions/setup-dotnet@v1
+              with:
+                  # .NET 7 is sadly required for the licenses check tool
+                  # https://github.com/tomchavakis/nuget-license/issues/200
+                  dotnet-version: |
+                      6.0.x
+                      7.0.x
+                      8.0.x
+                  source-url: https://nuget.pkg.github.com/elastic/index.json
+              env:
+                  NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 1
-    - run: |
-        git fetch --prune --unshallow --tags
-        echo exit code $?
-        git tag --list
-    - uses: actions/setup-dotnet@v1
-      with:
-        # .NET 7 is sadly required for the licenses check tool
-        # https://github.com/tomchavakis/nuget-license/issues/200
-        dotnet-version: |
-          6.0.x
-          7.0.x
-          8.0.x
-        source-url: https://nuget.pkg.github.com/elastic/index.json
-      env:
-        NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
-        
-    - run: ./build.sh release
-      name: Release
-      
-    - name: publish canary packages github package repository
-      if: github.event_name == 'push' && startswith(github.ref, 'refs/heads')
-      shell: bash
-      run:  |
-          until dotnet nuget push 'build/output/*.nupkg' -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate --no-symbols; do echo "Retrying"; sleep 1; done;
+            - run: ./build.sh release
+              name: Release
 
-    # Github packages requires authentication, this is likely going away in the future so for now we publish to feedz.io
-    - run: dotnet nuget push 'build/output/*.nupkg' -k ${{secrets.FEEDZ_IO_API_KEY}} -s https://f.feedz.io/elastic/all/nuget/index.json --skip-duplicate --no-symbols
-      name: publish canary packages to feedz.io
-      if: false && github.event_name == 'push' && startswith(github.ref, 'refs/heads')
+            - name: publish canary packages github package repository
+              if: github.event_name == 'push' && startswith(github.ref, 'refs/heads')
+              shell: bash
+                # this is a best effort to push to GHPR, we've observed it being unavailable intermittently
+              continue-on-error: true
+              run: dotnet nuget push '.artifacts/package/release/*.nupkg' -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate --no-symbols
+            
+            # Github packages requires authentication, this is likely going away in the future so for now we publish to feedz.io
+            - run: dotnet nuget push '.artifacts/package/release/*.nupkg' -k ${{secrets.FEEDZ_IO_API_KEY}} -s https://f.feedz.io/elastic/all/nuget/index.json --skip-duplicate --no-symbols
+              name: publish canary packages to feedz.io
+              if: false && github.event_name == 'push' && startswith(github.ref, 'refs/heads')
 
-    - run: dotnet nuget push 'build/output/*.nupkg' -k ${{secrets.NUGET_ORG_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols
-      name: release to nuget.org
-      if: false && github.event_name == 'push' && startswith(github.ref, 'refs/tags')
+            - run: dotnet nuget push '.artifacts/package/release/*.nupkg' -k ${{secrets.NUGET_ORG_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols
+              name: release to nuget.org
+              if: false && github.event_name == 'push' && startswith(github.ref, 'refs/tags')