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 950fef8..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:
-    name: Dangerfile
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/Gemfile.danger
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.4'
-          bundler-cache: true
-      - run: |
-          # the token is public, has public_repo scope and belongs to the grape-bot user owned by @dblock, this is ok
-          TOKEN=$(echo -n Z2hwX2lYb0dPNXNyejYzOFJyaTV3QUxUdkNiS1dtblFwZTFuRXpmMwo= | 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 3c8d6c2..fc41686 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### 0.5.1 (Next)
 
+* [#35](https://github.com/ruby-grape/grape-roar/pull/35): Migrate Danger to use danger-pr-comment workflow - [@dblock](https://github.com/dblock).
 * Your contribution here.
 
 ### 0.5.0 (2025/09/25)
diff --git a/Dangerfile b/Dangerfile
index 527dbb8..360cddf 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
-danger.import_dangerfile(gem: 'ruby-grape-danger')
+danger.import_dangerfile(gem: 'danger-pr-comment')
+changelog.check!
 toc.check!
diff --git a/Gemfile b/Gemfile
index 6c091fd..843e35f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,6 +16,10 @@ end
 group :development, :test do
   gem 'base64'
   gem 'bigdecimal'
+  gem 'danger'
+  gem 'danger-changelog'
+  gem 'danger-pr-comment'
+  gem 'danger-toc'
   gem 'mutex_m'
   gem 'nokogiri'
   gem 'ostruct'
diff --git a/Gemfile.danger b/Gemfile.danger
deleted file mode 100644
index d22a65b..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 'ruby-grape-danger', '~> 0.2.1', require: false
-end