diff --git a/.github/workflows/artifacts-index.yaml b/.github/workflows/artifacts-index.yaml
index e67921b18..f76f21a87 100644
--- a/.github/workflows/artifacts-index.yaml
+++ b/.github/workflows/artifacts-index.yaml
@@ -89,5 +89,6 @@ jobs:
             -H "Content-Type: application/json" \
             --data '{"files": [
               "https://os-artifacts.home-assistant.io/index.html",
-              "https://os-artifacts.home-assistant.io/index.json"
+              "https://os-artifacts.home-assistant.io/index.json",
+              "https://os-artifacts.home-assistant.io/indexes/${{ github.event.inputs.version }}.json"
             ] }'
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index efdaff00f..afb35e825 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -245,7 +245,7 @@ jobs:
 
   update_index:
     name: Update artifacts index
-    if: ${{ github.event_name != 'release' }}
+    if: ${{ github.event_name != 'release' && (always() && steps.prepare.outcome == 'success') }}
     needs: [ build, prepare ]
     uses: home-assistant/operating-system/.github/workflows/artifacts-index.yaml@dev
     with: