diff --git a/.github/workflows/release.yml b/.github/workflows/test-and-deploy.yml
similarity index 55%
rename from .github/workflows/release.yml
rename to .github/workflows/test-and-deploy.yml
index eac26805..8ac8e2c3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/test-and-deploy.yml
@@ -1,15 +1,37 @@
-name: Release
+name: Test and Deploy
 on:
   push:
-    tags:
-      - '*'
+    branches: [ '*' ]
+    tags: [ '*' ]
+  pull_request:
+    branches: [ main ]
+  schedule:
+    # Run automatically at 8AM PST Monday-Friday
+    - cron: '0 15 * * 1-5'
   workflow_dispatch:
 
 jobs:
-  release:
-    name: Release
+  test:
+    name: Test
     runs-on: ubuntu-latest
+    timeout-minutes: 20
+    strategy:
+      matrix:
+        java: [8, 11]
     steps:
+      - name: Checkout sendgrid-java
+      - uses: actions/checkout@v2
+
+      - name: Run Unit Tests
+        run: make test-docker version=${{ matrix.java }}
+
+  deploy:
+    name: Deploy
+    if: success() && github.ref_type == 'tag'
+    needs: [ test ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sendgrid-java
       - uses: actions/checkout@v2
 
       - name: Set up Sonatype Maven
@@ -33,16 +55,16 @@ jobs:
 
   notify-on-failure:
     name: Slack notify on failure
-    if: ${{ failure() }}
-    needs: [release]
+    if: failure() && github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || github.ref_type == 'tag')
+    needs: [ test, deploy ]
     runs-on: ubuntu-latest
     steps:
       - uses: rtCamp/action-slack-notify@v2
         env:
           SLACK_COLOR: failure
           SLACK_ICON_EMOJI: ':github:'
-          SLACK_MESSAGE: ${{ format('Failed to release {1}{3} {0}/{1}/actions/runs/{2}', github.server_url, github.repository, github.run_id, ':') }}
-          SLACK_TITLE: Release Failure
+          SLACK_MESSAGE: ${{ format('Test *{0}*, Deploy *{1}*, {2}/{3}/actions/runs/{4}', needs.test.result, needs.deploy.result, github.server_url, github.repository, github.run_id) }}
+          SLACK_TITLE: Action Failure - ${{ github.repository }}
           SLACK_USERNAME: GitHub Actions
           SLACK_MSG_AUTHOR: twilio-dx
           SLACK_FOOTER: Posted automatically using GitHub Actions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index ba2528f3..00000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Tests
-on:
-  push:
-    branches: [ '*' ]
-  pull_request:
-    branches: [ main ]
-  schedule:
-    # Run automatically at 8AM PST Monday-Friday
-    - cron: '0 15 * * 1-5'
-  workflow_dispatch:
-
-jobs:
-  test:
-    name: Test
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    strategy:
-      matrix:
-        java: [8, 11]
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Run Unit Tests
-        run: make test-docker version=${{ matrix.java }}
-
-  notify-on-failure:
-    name: Slack notify on failure
-    if: ${{ failure() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
-    needs: [test]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_COLOR: failure
-          SLACK_ICON_EMOJI: ':github:'
-          SLACK_MESSAGE: ${{ format('Build {2} in {1} failed{3} {0}/{1}/actions/runs/{2}', github.server_url, github.repository, github.run_id, ':') }}
-          SLACK_TITLE: Build Failure
-          SLACK_USERNAME: GitHub Actions
-          SLACK_MSG_AUTHOR: twilio-dx
-          SLACK_FOOTER: Posted automatically using GitHub Actions
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          MSG_MINIMAL: true
diff --git a/README.md b/README.md
index 47542863..f7d63183 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![SendGrid Logo](twilio_sendgrid_logo.png)
 
-[![BuildStatus](https://github.com/sendgrid/sendgrid-java/actions/workflows/test.yml/badge.svg)](https://github.com/sendgrid/sendgrid-java/actions/workflows/test.yml)
+[![BuildStatus](https://github.com/sendgrid/sendgrid-java/actions/workflows/test-and-deploy.yml/badge.svg)](https://github.com/sendgrid/sendgrid-java/actions/workflows/test-and-deploy.yml)
 [![Maven Central](https://img.shields.io/maven-central/v/com.sendgrid/sendgrid-java.svg)](http://mvnrepository.com/artifact/com.sendgrid/sendgrid-java)
 [![Twitter Follow](https://img.shields.io/twitter/follow/sendgrid.svg?style=social&label=Follow)](https://twitter.com/sendgrid)
 [![GitHub contributors](https://img.shields.io/github/contributors/sendgrid/sendgrid-java.svg)](https://github.com/sendgrid/sendgrid-java/graphs/contributors)