diff --git a/.github/workflows/conflicts.yaml b/.github/workflows/conflicts.yaml
deleted file mode 100644
index dc273daa..00000000
--- a/.github/workflows/conflicts.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Rebase Conflicts
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types: [synchronize]
-
-permissions:
-  contents: read
-  pull-requests: write
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  conflicts:
-    name: Check for Conflicts
-    runs-on: ubuntu-latest
-    steps:
-      - name: Label PRs
-        uses: ExodusMovement/actions-label-merge-conflict@71abef2871620db9447045b06bcd150ed607dc13
-        with:
-          dirtyLabel: 'blocked/needs-rebase'
-          repoToken: '${{ secrets.GITHUB_TOKEN }}'
-          commentOnDirty: 'Houston, this is Conflict Bot. We have a conflict. I repeat, we have a conflict. @<%= author %> please rebase. Acknowledge.'
-          retryAfter: 45
-          removeDirtyComment: true
diff --git a/.github/workflows/valid-pr.yaml b/.github/workflows/valid-pr.yaml
new file mode 100644
index 00000000..afe3d30c
--- /dev/null
+++ b/.github/workflows/valid-pr.yaml
@@ -0,0 +1,34 @@
+name: Valid PR
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - ready_for_review
+      - synchronize
+
+permissions:
+  contents: read
+  pull-requests: write
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  valid-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate
+        uses: ExodusMovement/soteria-action@04dab36c9d762a04756972f4bb279467adb1a5af
+        with:
+          validations: conflicting
+          conflictingLabel: 'blocked/needs-rebase'
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          skipDraft: conflicting
+          retryAfterOnConflicting: 45
+          removeValidationComments: true