diff --git a/.github/workflows/stormweaver.yml b/.github/workflows/stormweaver.yml
index 779723740129c..f66ca0b3a6c39 100644
--- a/.github/workflows/stormweaver.yml
+++ b/.github/workflows/stormweaver.yml
@@ -50,5 +50,23 @@ jobs:
         working-directory: postgres
 
       - name: Run Stormweaver
-        run: bin/stormweaver scenarios/basic.lua -i ../../pginst
+        run: bin/stormweaver scenarios/basic.lua -i ../pginst
         working-directory: stormweaver
+
+      - name: Upload logs on test fail
+        uses: actions/upload-artifact@v4
+        if: ${{ failure() }}
+        with:
+          name: stormweaver-logs
+          path: |
+            stormweaver/logs/*
+          retention-days: 3
+
+      - name: Upload datadir on test fail
+        uses: actions/upload-artifact@v4
+        if: ${{ failure() }}
+        with:
+          name: stormweaver-datadirs
+          path: |
+            stormweaver/datadirs/*
+          retention-days: 3