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 d8a4cff..bd89a88 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -1,22 +1,13 @@
----
-name: danger
+name: Danger
+
 on:
   pull_request:
     types: [opened, reopened, edited, synchronize]
+
 jobs:
   danger:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 3.4
-        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
+    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/Dangerfile b/Dangerfile
index c7a9f9c..532532a 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -1,2 +1,4 @@
+danger.import_dangerfile(gem: 'danger-pr-comment')
+
 changelog.check!
 toc.check!
diff --git a/Gemfile b/Gemfile
index 64e8cb6..868f6a2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,9 @@ group :development, :test do
 end
 
 group :test do
-  gem 'danger-changelog', '~> 0.7.0'
+  gem 'danger', '~> 9.5'
+  gem 'danger-changelog', '~> 0.8.0'
+  gem 'danger-pr-comment', '~> 0.1.0'
   gem 'danger-toc', '~> 0.2.0'
   gem 'minitest'
   gem 'mocha'
diff --git a/test/test_helper.rb b/test/test_helper.rb
index f0a1d9c..413779d 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -17,14 +17,13 @@
 
 require 'minitest/autorun'
 require 'minitest/pride'
-require 'minitest/unit'
 require 'mocha/minitest'
 require 'json'
 
 require 'faraday'
 require 'faraday/request/instrumentation'
 
-MiniTest::Assertions.class_eval do
+Minitest::Assertions.class_eval do
   def stub_request(conn, adapter_class = Faraday::Adapter::Test, &stubs_block)
     adapter_handler = conn.builder.handlers.find { |h| h.klass < Faraday::Adapter }
     if adapter_handler