diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 7a8c8aa..3f22685 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -1,8 +1,11 @@
+# Release to Savant or publish to Maven.
+# Only runs via manual workflow dispatch.
+
 # Run locally with act:
 #
 # act pull_request [--input command=[command]] \
 #  --platform fusionauth-builder=[ecr-repo-name]/fusionauth-builder:latest] \
-#  --workflows ./.github/workflows/release.yaml \
+#  --workflows ./.github/workflows/deploy.yaml \
 #  --env-file <(aws configure export-credentials --profile [aws-profile] --format env)
 
 name: Deploy
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
new file mode 100644
index 0000000..388957a
--- /dev/null
+++ b/.github/workflows/docs.yaml
@@ -0,0 +1,23 @@
+name: Publish Docs
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  docs:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Generate docs
+        uses: phpDocumentor/phpDocumentor@master
+
+      - uses: EndBug/add-and-commit@v9
+        with:
+          add: 'docs'
+          message: ':memo: Updating docs'
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
deleted file mode 100644
index 94e9a82..0000000
--- a/.github/workflows/docs.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Publish Docs
-
-on:
-  push:
-    branches: [ "master" ]
-
-jobs:
-  docs:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Generate docs
-      uses: phpDocumentor/phpDocumentor@master
-
-    - uses: EndBug/add-and-commit@v9 
-      with:
-        add: 'docs'
-        message: ':memo: Updating docs'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yaml
similarity index 82%
rename from .github/workflows/test.yml
rename to .github/workflows/test.yaml
index 8c510ea..668fb32 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yaml
@@ -1,16 +1,19 @@
-name: Test Library
+name: Test
 
 on:
   push:
-    branches: [ "master" ]
+    branches:
+      - main
   pull_request:
-    branches: [ "master" ]
+    branches:
+      - main
+  workflow_dispatch:
 
 permissions:
   contents: read
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -20,11 +23,13 @@ jobs:
       run: docker compose up -d
 
     - name: Validate composer.json and composer.lock
-      run: composer validate
+      run: |
+        composer update
+        composer validate
 
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: vendor
         key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}