diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index eb96d3cd2..d94218e9f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -14,7 +14,7 @@ Before engaging with this community, please read and understand our
 ## Setting up development environment
 
 * The gem follows standard Rails practices:
-  * `bundle install` to install dependencies
+  * `bin/setup` to install dependencies
   * `bin/rails server` to start the server
   * `bin/rails test` to run tests
   * `bin/rails test:system` to run system tests
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e7d59d68d..74f073a6e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,6 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }} / ${{ matrix.database }}
+    timeout-minutes: 5
     strategy:
       fail-fast: false
       matrix:
@@ -50,5 +51,6 @@ jobs:
       uses: actions/upload-artifact@v4
       if: failure()
       with:
-        name: screenshots
+        name: screenshots-${{ strategy.job-index }}
         path: test/dummy/tmp/screenshots
+        if-no-files-found: ignore
diff --git a/bin/setup b/bin/setup
new file mode 100755
index 000000000..3b6facc33
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -ex
+
+bundle install
+bin/rails db:setup