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 52cf0f1..bd89a88 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -1,22 +1,13 @@
----
-name: danger
-on: [pull_request]
+name: Danger
+
+on:
+  pull_request:
+    types: [opened, reopened, edited, synchronize]
+
 jobs:
   danger:
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_GEMFILE: Gemfile.danger      
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-        bundler-cache: true
-    - name: Run Danger
-      run: |
-        # the personal token is public, this is ok, base64 encode to avoid tripping Github
-        TOKEN=$(echo -n Z2hwX0xNQ3VmanBFeTBvYkZVTWh6NVNqVFFBOEUxU25abzBqRUVuaAo= | base64 --decode)
-        DANGER_GITHUB_API_TOKEN=$TOKEN bundle exec danger --verbose
\ No newline at end of file
+    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 1bcabe7..e1c39b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 2.2.1 (Next)
 
 * Your contribution here.
+* [#181](https://github.com/slack-ruby/slack-ruby-bot-server/pull/181): Migrated Danger to `danger-pr-comment` workflow - [@dblock](https://github.com/dblock).
 * [#180](https://github.com/slack-ruby/slack-ruby-bot-server/pull/180): Add support for Grape v3 - [@markokajzer](https://github.com/markokajzer).
 
 ### 2.2.0 (2025/09/22)
diff --git a/Dangerfile b/Dangerfile
index 8d5c344..532532a 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -1,2 +1,4 @@
-danger.import_dangerfile(gem: 'slack-ruby-danger')
+danger.import_dangerfile(gem: 'danger-pr-comment')
+
+changelog.check!
 toc.check!
diff --git a/Gemfile b/Gemfile
index 061134b..04e0a2c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,6 +24,9 @@ gemspec
 gem 'bundler'
 gem 'byebug'
 gem 'capybara'
+gem 'danger-changelog'
+gem 'danger-pr-comment'
+gem 'danger-toc'
 gem 'fabrication'
 gem 'faker'
 gem 'faraday'
diff --git a/Gemfile.danger b/Gemfile.danger
deleted file mode 100644
index b2f7ef8..0000000
--- a/Gemfile.danger
+++ /dev/null
@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-group :test do
-  gem 'danger-toc', '~> 0.2.0', require: false
-  gem 'slack-ruby-danger', '~> 0.2.0', require: false
-end