diff --git a/.github/workflows/danger-comment.yml b/.github/workflows/danger-comment.yml
new file mode 100644
index 0000000..8e15cb6
--- /dev/null
+++ b/.github/workflows/danger-comment.yml
@@ -0,0 +1,11 @@
+name: Danger Comment
+
+on:
+  workflow_run:
+    workflows: [Danger]
+    types: [completed]
+
+jobs:
+  comment:
+    uses: numbata/danger-pr-comment/.github/workflows/danger-comment.yml@v0.1.0
+    secrets: inherit
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index c2db24e..bd89a88 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -1,17 +1,13 @@
 name: Danger
-on: [pull_request]
+
+on:
+  pull_request:
+    types: [opened, reopened, edited, synchronize]
+
 jobs:
   danger:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7
-          bundler-cache: true
-      - run: |
-          # Personal access token for dangerpr-bot - public, but base64 encoded to avoid tripping up GitHub
-          TOKEN=$(echo -n Z2hwX0xNQ3VmanBFeTBvYkZVTWh6NVNqVFFBOEUxU25abzBqRUVuaAo= | base64 --decode)
-          DANGER_GITHUB_API_TOKEN=$TOKEN bundle exec danger --verbose
+    uses: numbata/danger-pr-comment/.github/workflows/danger-run.yml@v0.1.0
+    secrets: inherit
+    with:
+      ruby-version: '3.4'
+      bundler-cache: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e239a4f..970646d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
 ### 4.3.0 (Next)
+
+* [#1](https://github.com/dblock/mongoid-rspec/pull/1): Migrate to danger-pr-comment workflow - [@dblock](https://github.com/dblock).
 * Your contribution here.
 
 ### 4.2.0 (06/04/2024)
diff --git a/Dangerfile b/Dangerfile
index 6248c90..532532a 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -1 +1,4 @@
-danger.import_dangerfile(gem: 'mongoid-danger')
+danger.import_dangerfile(gem: 'danger-pr-comment')
+
+changelog.check!
+toc.check!
diff --git a/Gemfile b/Gemfile
index 7f4f5e9..7b769ed 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,3 +3,8 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'danger'
+gem 'danger-changelog'
+gem 'danger-pr-comment'
+gem 'danger-toc'
diff --git a/mongoid-rspec.gemspec b/mongoid-rspec.gemspec
index 53e1158..b78e794 100644
--- a/mongoid-rspec.gemspec
+++ b/mongoid-rspec.gemspec
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.metadata['rubygems_mfa_required'] = 'true'
 
   s.add_development_dependency 'appraisal', '~> 2.0'
-  s.add_development_dependency 'mongoid-danger', '~> 0.2'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rails'
   s.add_development_dependency 'rspec'