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
new file mode 100644
index 0000000..7249098
--- /dev/null
+++ b/.github/workflows/danger.yml
@@ -0,0 +1,13 @@
+name: Danger
+
+on:
+  pull_request:
+    types: [opened, reopened, edited, synchronize]
+
+jobs:
+  danger:
+    uses: numbata/danger-pr-comment/.github/workflows/danger-run.yml@v0.1.0
+    secrets: inherit
+    with:
+      ruby-version: '3.3'
+      bundler-cache: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 868e9d5..d14fb33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### 0.4.7 (Next)
 
+* [#18](https://github.com/mongoid/mongoid-shell/pull/18): Migrate Danger to danger-pr-comment workflow - [@dblock](https://github.com/dblock).
 * Your contribution here.
 
 ### 0.4.6 (12/29/2017)
diff --git a/Dangerfile b/Dangerfile
index 6248c90..f769387 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -1 +1,5 @@
-danger.import_dangerfile(gem: 'mongoid-danger')
+# frozen_string_literal: true
+
+danger.import_dangerfile(gem: 'danger-pr-comment')
+
+changelog.check!
diff --git a/Gemfile b/Gemfile
index c83067a..6b39d1b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,5 +20,7 @@ group :development, :test do
   gem 'bundler'
   gem 'rspec', '~> 3.0'
   gem 'rubocop', '~> 0.49.1'
-  gem 'mongoid-danger', '~> 0.1.1'
+  gem 'danger'
+  gem 'danger-changelog'
+  gem 'danger-pr-comment'
 end