diff --git a/contrib/heptapod-ci.yml b/contrib/heptapod-ci.yml
--- a/contrib/heptapod-ci.yml
+++ b/contrib/heptapod-ci.yml
@@ -1,7 +1,6 @@
 stages:
   - tests
   - packages
-  - phabricator
 
 image: registry.heptapod.net/mercurial/ci-images/mercurial-core
 
@@ -52,10 +51,25 @@
             - PYTHON: [python2, python3]
             - {PYTHON: [python3], HG_RUST_FEATURES: [dirstate-tree]}
 
-phabricator-refresh:
-    stage: phabricator
+phabricator-success:
+    stage: .post
+    when: on_success
     script:
-      - "./contrib/phab-refresh-stack.sh --comment \":white_check_mark: refresh by Heptapod after a successful CI run (:octopus: :green_heart:)\""
+      - >
+          ./contrib/phab-refresh-stack.sh
+          --comment ":white_check_mark: refresh by
+          Heptapod after a successful CI run (:octopus: :green_heart:)
+          ${CI_PIPELINE_URL}"
+
+phabricator-failure:
+    stage: .post
+    when: on_failure
+    script:
+      - >
+          ./contrib/phab-refresh-stack.sh
+          --comment ":negative_squared_cross_mark: refresh by
+          Heptapod after a failed CI run (:octopus: :heart:)
+          ${CI_PIPELINE_URL}"
 
 test:
     extends: .runtests_template