diff --git a/.github/workflows/deploy-sites.yaml b/.github/workflows/deploy-sites.yaml
index 040b73c..433860a 100644
--- a/.github/workflows/deploy-sites.yaml
+++ b/.github/workflows/deploy-sites.yaml
@@ -34,9 +34,9 @@ jobs:
               sites+=("${dir%/}")
             fi
           done
-          
-          # Create JSON array for matrix strategy
-          sites_json=$(printf '%s\n' "${sites[@]}" | jq -R . | jq -s .)
+
+          # Create JSON array and output on single line
+          sites_json=$(printf '%s\n' "${sites[@]}" | jq -R . | jq -s -c .)
           echo "sites=$sites_json" >> $GITHUB_OUTPUT
           echo "Found sites: $sites_json"
 
@@ -54,48 +54,6 @@ jobs:
         run: |
           mkdir -p _site/${{ matrix.site }}
           cp -r ${{ matrix.site }}/* _site/${{ matrix.site }}/
-          
-          # Create a root index if it doesn't exist
-          if [ ! -f "_site/index.html" ]; then
-            cat > _site/index.html << 'EOF'
-            <!DOCTYPE html>
-            <html>
-            <head>
-              <title>Sites Index</title>
-              <style>
-                body { font-family: system-ui, sans-serif; max-width: 800px; margin: 40px auto; padding: 20px; }
-                h1 { color: #333; }
-                ul { list-style: none; padding: 0; }
-                li { margin: 10px 0; }
-                a { color: #0366d6; text-decoration: none; font-size: 1.1em; }
-                a:hover { text-decoration: underline; }
-              </style>
-            </head>
-            <body>
-              <h1>📁 Available Sites</h1>
-              <ul id="sites-list"></ul>
-              <script>
-                const sites = document.getElementById('sites-list');
-                const paths = window.location.pathname.split('/').filter(p => p);
-                const basePath = paths.length > 0 ? '/' + paths.join('/') : '';
-                
-                fetch(basePath + '/sites.json')
-                  .then(r => r.json())
-                  .then(data => {
-                    data.forEach(site => {
-                      const li = document.createElement('li');
-                      const a = document.createElement('a');
-                      a.href = './' + site + '/';
-                      a.textContent = site;
-                      li.appendChild(a);
-                      sites.appendChild(li);
-                    });
-                  });
-              </script>
-            </body>
-            </html>
-            EOF
-          fi
 
       - name: Upload site artifact
         uses: actions/upload-artifact@v4
@@ -103,9 +61,59 @@ jobs:
           name: site-${{ matrix.site }}
           path: _site
 
+  create-index:
+    runs-on: ubuntu-latest
+    needs: discover-sites
+    steps:
+      - name: Create root index
+        run: |
+          mkdir -p _site
+          cat > _site/index.html << 'EOF'
+          <!DOCTYPE html>
+          <html>
+          <head>
+            <title>Sites Index</title>
+            <style>
+              body { font-family: system-ui, sans-serif; max-width: 800px; margin: 40px auto; padding: 20px; }
+              h1 { color: #333; }
+              ul { list-style: none; padding: 0; }
+              li { margin: 10px 0; }
+              a { color: #0366d6; text-decoration: none; font-size: 1.1em; }
+              a:hover { text-decoration: underline; }
+            </style>
+          </head>
+          <body>
+            <h1>📁 Available Sites</h1>
+            <ul id="sites-list"></ul>
+            <script>
+              const sites = document.getElementById('sites-list');
+              fetch('./sites.json')
+                .then(r => r.json())
+                .then(data => {
+                  data.forEach(site => {
+                    const li = document.createElement('li');
+                    const a = document.createElement('a');
+                    a.href = './' + site + '/';
+                    a.textContent = site;
+                    li.appendChild(a);
+                    sites.appendChild(li);
+                  });
+                });
+            </script>
+          </body>
+          </html>
+          EOF
+          echo '${{ needs.discover-sites.outputs.sites }}' > _site/sites.json
+
+      - name: Upload index artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: site-index
+          path: _site
+
   merge-and-deploy:
     runs-on: ubuntu-latest
-    needs: [discover-sites, build]
+    needs: [discover-sites, build, create-index]
     steps:
       - name: Download all artifacts
         uses: actions/download-artifact@v4
@@ -114,14 +122,10 @@ jobs:
           pattern: site-*
           merge-multiple: true
 
-      - name: Create sites index
-        run: |
-          echo '${{ needs.discover-sites.outputs.sites }}' > _site/sites.json
-
       - name: Upload to GitHub Pages
         uses: actions/upload-pages-artifact@v3
         with:
           path: _site
 
       - name: Deploy to GitHub Pages
-        uses: actions/deploy-pages@v4
\ No newline at end of file
+        uses: actions/deploy-pages@v4
