diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 680d3c4c..57b451d0 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -4,6 +4,14 @@
 
 <!--- Provide a general summary of the issue in the Title above -->
 
+### Steps to Reproduce (for bugs)
+<!--- Provide a link to a live example or an unambiguous set of steps to
+reproduce this bug. Include code to reproduce, if relevant -->
+1.
+1.
+1.
+1.
+
 ### Expected Behaviour
 <!--- If you're describing a bug, tell us what should happen. If you're
 suggesting a change/improvement, tell us how it should work -->
@@ -14,24 +22,16 @@ behavior. If suggesting a change/improvement, explain the difference from
 current behavior -->
 
 ### Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, or ideas how
+<!--- Not obligatory, but suggest a fix/reason for the bug, or ideas on how
 to implement the addition or change -->
 
-### Steps to Reproduce (for bugs)
-<!--- Provide a link to a live example or an unambiguous set of steps to
-reproduce this bug. Include code to reproduce, if relevant -->
-1.
-1.
-1.
-1.
-
 ### Context
 <!--- How has this issue affected you? What are you trying to accomplish?
 Providing context helps us come up with a solution that is most useful in
 the real world -->
 
 ### Your Environment
-<!--- Include as many relevant details about the environment you experienced
+<!--- Include relevant details about the environment you experienced
 the bug in -->
 - Git hash commit (`git log -1`):
 - Docker version `docker version` (e.g. Docker 17.0.05):
@@ -42,4 +42,3 @@ the bug in -->
     <details>
     <summary>Logs from `cvat` container</summary>
     </details>
-
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 87332b9b..0feeca3c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,7 @@
-<!-- Raised an issue to propose your change (https://github.com/cvat-ai/cvat/issues).
+<!-- Raise an issue to propose your change (https://github.com/opencv/cvat/issues).
 It helps to avoid duplication of efforts from multiple independent contributors.
 Discuss your ideas with maintainers to be sure that changes will be approved and merged.
-Read the [CONTRIBUTION](https://github.com/cvat-ai/cvat/blob/develop/CONTRIBUTING.md)
-guide. -->
+Read the [Contribution guide](https://opencv.github.io/cvat/docs/contributing/). -->
 
 <!-- Provide a general summary of your changes in the Title above -->
 
@@ -18,22 +17,23 @@ see how your change affects other areas of the code, etc. -->
 
 ### Checklist
 <!-- Go over all the following points, and put an `x` in all the boxes that apply.
-If an item isn't applicable by a reason then ~~explicitly strikethrough~~ the whole
-line. If you don't do that github will show an incorrect process for the pull request.
+If an item isn't applicable for some reason, then ~~explicitly strikethrough~~ the whole
+line. If you don't do that, GitHub will show incorrect progress for the pull request.
 If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
 - [ ] I submit my changes into the `develop` branch
-- [ ] I have added a description of my changes into [CHANGELOG](https://github.com/cvat-ai/cvat/blob/develop/CHANGELOG.md) file
-- [ ] I have updated the [documentation](
-  https://github.com/cvat-ai/cvat/blob/develop/README.md#documentation) accordingly
+- [ ] I have added a description of my changes into the [CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md) file
+- [ ] I have updated the documentation accordingly
 - [ ] I have added tests to cover my changes
-- [ ] I have linked related issues ([read github docs](
+- [ ] I have linked related issues (see [GitHub docs](
   https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
-- [ ] I have increased versions of npm packages if it is necessary ([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
-[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning), [cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning) and [cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
+- [ ] I have increased versions of npm packages if it is necessary
+  ([cvat-canvas](https://github.com/opencv/cvat/tree/develop/cvat-canvas#versioning),
+  [cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning),
+  [cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning) and
+  [cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning))
 
 ### License
 
 - [ ] I submit _my code changes_ under the same [MIT License](
-  https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the project.
+  https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the project.
   Feel free to contact the maintainers if that's a concern.
-