diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index f665344..d746fb4 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -1,16 +1,15 @@
-name: Continuous Disaster...
-on:
-  pull_request:
-  push:
-    branches:
-      - main
+name: CI
+
+on: pull_request
+
 jobs:
-  test:
+  ci:
     runs-on: ubuntu-latest
     strategy:
-      matrix:
-        python-version: ["3.11"]
       fail-fast: false
+      matrix:
+        python-version: [ "3.11" ]
+        poetry-version: [ "1.4.0" ]
 
     env:
       PYTHONDONTWRITEBYTECODE: 1
@@ -37,18 +36,13 @@ jobs:
       - name: Create database schema
         run: PGPASSWORD=secret psql -h 127.0.0.1 -d testdb -U app-user -c "CREATE SCHEMA shakespeare; CREATE SCHEMA happy_hog;"
       - uses: actions/checkout@v3
-      - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Poetry
-        uses: snok/install-poetry@v1
-      - name: Load cached venv
-        id: cached-poetry-dependencies
-        uses: actions/cache@v3
+        uses: abatilo/actions-poetry@v2
         with:
-          path: .venv
-          key: venv-${{ runner.os }}-3.11-${{ hashFiles('**/poetry.lock') }}
+          poetry-version: ${{ matrix.poetry-version }}
       - name: Install dependencies
         if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
         run: poetry install --no-interaction --no-root