diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 67caa216bf..f66163fcd0 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -21,12 +21,10 @@ _Put an `x` in the boxes that apply_
 
 _Put an `x` in the boxes that apply.
 You can also fill these out after creating the PR.
-If you're unsure about any of them, don't hesitate to ask on the mailing list.
-We're here to help!
 This is simply a reminder of what we are going to look for before merging your code._
 
+- [ ] **Mandatory**: I (or my employer/client) have have signed the CA (see https://github.com/rabbitmq/cla)
 - [ ] I have read the `CONTRIBUTING.md` document
-- [ ] I have signed the CA (see https://cla.pivotal.io/sign/rabbitmq)
 - [ ] I have added tests that prove my fix is effective or that my feature works
 - [ ] All tests pass locally with my changes
 - [ ] If relevant, I have added necessary documentation to https://github.com/rabbitmq/rabbitmq-website
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 116daea6e4..9d15ab89e8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,13 +7,13 @@ Pull requests is the primary place of discussing code changes.
 
 The process is fairly standard:
 
+ * Make sure you (or your employer/client) [signs the Contributor License Agreement](https://github.com/rabbitmq/cla) if needed (see below)
  * Present your idea to the RabbitMQ core team using [GitHub Discussions](https://github.com/rabbitmq/rabbitmq-server/discussions) or [RabbitMQ community Discord server](https://rabbitmq.com/discord)
  * Fork the repository or repositories you plan on contributing to
  * Run `git clean -xfffd && gmake clean && gmake distclean && gmake` to build all subprojects from scratch
  * Create a branch with a descriptive name
  * Make your changes, run tests, ensure correct code formatting, commit with a [descriptive message](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html), push to your fork
  * Submit pull requests with an explanation what has been changed and **why**
- * Submit a filled out and signed [Contributor Agreement](https://github.com/rabbitmq/cla) if needed (see below)
  * Be patient. We will get to your pull request eventually
 
 
@@ -213,9 +213,11 @@ See [CODE_OF_CONDUCT.md](./CODE_OF_CONDUCT.md).
 
 ## Contributor Agreement
 
-If you want to contribute a non-trivial change, please submit a signed copy of our
-[Contributor Agreement](https://github.com/rabbitmq/cla) before submitting
-a pull request to `teamrabbitmq </> gmail dot c0m` and set the subject to "RabbitMQ CLA".
+Before submitting your first pull request, please submit a signed copy of our
+[Contributor Agreement](https://github.com/rabbitmq/cla) over email  to `teamrabbitmq </> gmail dot c0m` with the subject of "RabbitMQ CLA".
+
+Team RabbitMQ will not be able to accept contributions from individuals and legal entities (companies, non-profits)
+that haven't signed the CLA.
 
 ## Where to Ask Questions