diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2d886ecf4..c4e652ab0 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,19 +1,28 @@
 <!--
-
-You'll be asked to accept the PhotoPrism.org Individual Contributor License Agreement https://cla-assistant.io/photoprism/photoprism once your PR will be created, please review them, your PR will be rejected if you don't accept them.
-
-Because we want to create the best possible product for our users, we have a set of guidelines which ensure that all source code contributions are acceptable:
-
-Please check the following items by replacing "[ ]" with "[x]", you can also do it when viewing the pull request once it has been created
+Please describe your pull request:
+- What does it implement / fix / improve?
+- Is it related to an existing issue?
 -->
 
-- [ ] The feature is fully implemented
-- [ ] Unit and acceptance tests have be written
-- [ ] The feature work with sqlite and mysql
-- [ ] The UI must be fully responsive
-- [ ] It has tested on multiple browsers and devices
-- [ ] Translations have been created for all languages
-- [ ] Docs have been updated
+<!--
+After submitting your first pull request, you will automatically be asked to accept our Contributor License Agreement (CLA):
+
+https://github.com/photoprism/photoprism/blob/develop/CONTRIBUTING.md#contributor-license-agreement
+
+Because we want to create the best possible product for our users, we have a set of guidelines to ensure that all submissions are acceptable.
+Please check the following items by replacing "[ ]" with "[x]".
+You can also do this when viewing the pull request after it was created:
+-->
+
+Acceptance Criteria:
+
+- [ ] **Features and improvements are fully implemented** so that they can be released at any time without additional work
+- [ ] **Automated unit and/or acceptance tests have been added** to ensure the changes work as expected and to reduce repetitive manual work on our side
+- [ ] **User interface changes are fully responsive** and have been tested on all major browsers and various devices
+- [ ] Database-related changes are compatible with SQLite and MariaDB
+- [ ] Translations have been / will be updated (specify if needed)
+- [ ] Documentation has been / will be updated (specify if needed)
+- [ ] Contributor License Agreement (CLA) has been signed
 
 <!--
 Reviewing, testing and finally merging pull requests consumes significant resources on our side. Unless it's just a small fix, it may take several months.
@@ -21,6 +30,3 @@ Reviewing, testing and finally merging pull requests consumes significant resour
 Thanks for your patience :)
 -->
 
-<!--
-Please write below the goal of this pull request
--->
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2c4525d28..043c188ce 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -29,7 +29,7 @@ to determine the cause of your problem. If you have a general question, need hel
 
 ## Submitting Pull Requests ##
 
-Because we want to create the best possible product for our users, we have a [set of guidelines](https://docs.photoprism.app/developer-guide/pull-requests) to ensure that all source code submissions are acceptable.
+Because we want to create the best possible product for our users, we have a [set of guidelines](https://docs.photoprism.app/developer-guide/pull-requests) to ensure that all submissions are acceptable.
 
 They include step-by-step instructions for submitting new features,
 bug fixes, and documentation improvements.