diff --git a/doc/source/running-your-own.rst b/doc/source/running-your-own.rst
index 828514cea4..d6837da565 100644
--- a/doc/source/running-your-own.rst
+++ b/doc/source/running-your-own.rst
@@ -322,7 +322,7 @@ which get the most load (as they run jobs from anyone).
 
 #. Setup Jenkins per :ref:`jenkins`.
 
-At this stage doing a 'recheck no bug' should still report LOST on a change.
+At this stage doing a 'recheck' should still report LOST on a change.
 But in the zuul debug.log in /var/log/zuul you should see a 'build xxx not
 registered' being reported from gearman : this indicates you have never had an
 executor register itself for that queue, and it's being ignored.
diff --git a/doc/source/third_party.rst b/doc/source/third_party.rst
index 538c26c857..5739849aa6 100644
--- a/doc/source/third_party.rst
+++ b/doc/source/third_party.rst
@@ -31,7 +31,7 @@ Requirements
   party testing system breaks.
 * Support recheck to request re-running a test.
 
-  * Support the following syntaxes ``recheck no bug`` and ``recheck bug ###``.
+  * Support the following syntaxes: ``recheck``.
   * Recheck means recheck everything. A single recheck comment should
     re-trigger all testing systems.
 * Publish who the maintainers of the third party testing system are, and make
diff --git a/modules/openstack_project/files/zuul/layout-dev.yaml b/modules/openstack_project/files/zuul/layout-dev.yaml
index 485e878317..c6043d7d0d 100644
--- a/modules/openstack_project/files/zuul/layout-dev.yaml
+++ b/modules/openstack_project/files/zuul/layout-dev.yaml
@@ -12,7 +12,7 @@ pipelines:
         - event: patchset-created
         - event: change-restored
         - event: comment-added
-          comment_filter: (?i)^(Patch Set [0-9]+:\n\n)?\s*recheck(( (?:bug|lp)[\s#:]*(\d+))|( no bug))\s*$
+          comment_filter: (?i)^(Patch Set [0-9]+:\n\n)?\s*recheck
     success:
       gerrit:
         verified: 1
@@ -31,7 +31,7 @@ pipelines:
           approval:
             - workflow: 1
         - event: comment-added
-          comment_filter: (?i)^(Patch Set [0-9]+:\n\n)?\s*reverify( (?:bug|lp)[\s#:]*(\d+))\s*$
+          comment_filter: (?i)^(Patch Set [0-9]+:\n\n)?\s*reverify
     start:
       gerrit:
         verified: 0
@@ -89,7 +89,7 @@ pipelines:
       gerrit:
         - event: patchset-created
         - event: comment-added
-          comment_filter: (?i)^(Patch Set [0-9]+:\n\n)?\s*recheck(( (?:bug|lp)[\s#:]*(\d+))|( no bug))\s*$
+          comment_filter: (?i)^(Patch Set [0-9]+:\n\n)?\s*recheck
 
   - name: experimental
     description: On-demand pipeline for requesting a run against a set of jobs that are not yet gating. Leave review comment of "check experimental" to run jobs in this pipeline.
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 5a639367c0..6d76fde8c9 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -15,7 +15,7 @@ pipelines:
         - event: patchset-created
         - event: change-restored
         - event: comment-added
-          comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*recheck(( (?:bug|lp)[\s#:]*(\d+))|( no bug))\s*$
+          comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*recheck
         - event: comment-added
           require-approval:
             - username: jenkins
@@ -27,7 +27,7 @@ pipelines:
             - username: jenkins
               older-than: 24h
         - event: comment-added
-          comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*reverify( (?:bug|lp)[\s#:]*(\d+))\s*$
+          comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*reverify
           require-approval:
             - workflow: 1
             - username: jenkins
@@ -126,7 +126,7 @@ pipelines:
       gerrit:
         - event: patchset-created
         - event: comment-added
-          comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*recheck(( (?:bug|lp)[\s#:]*(\d+))|( no bug))\s*$
+          comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*recheck
 
   - name: experimental
     description: On-demand pipeline for requesting a run against a set of jobs that are not yet gating. Leave review comment of "check experimental" to run jobs in this pipeline.
@@ -196,7 +196,7 @@ pipelines:
         - event: patchset-created
         - event: change-restored
         - event: comment-added
-          comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*recheck(( (?:bug|lp)[\s#:]*(\d+))|( no bug))\s*$
+          comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*recheck
     success:
       gerrit: {}
     failure: