diff --git a/.gitlab/merge_request_templates/Default.md b/.gitlab/merge_request_templates/Default.md
new file mode 100644
index 0000000000000000000000000000000000000000..4bcba143b220e82ba312de4923b888e332a2038c_LmdpdGxhYi9tZXJnZV9yZXF1ZXN0X3RlbXBsYXRlcy9EZWZhdWx0Lm1k
--- /dev/null
+++ b/.gitlab/merge_request_templates/Default.md
@@ -0,0 +1,33 @@
+<!-- After merging changes to this template, update the `Default description template for merge requests` -->
+<!-- found under Settings - General Merge Requests -->
+## What does this MR do?
+
+<!-- Briefly describe what this MR is about. -->
+
+%{first_multiline_commit}
+
+## Related issues
+
+<!-- Link related issues below. Insert the issue link or reference after the word "Closes" if merging this should automatically close it. -->
+
+## Checklist
+
+See [Definition of done](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/CONTRIBUTING.md#definition-of-done).
+
+For anything in this list which will not be completed, please provide a reason in the MR discussion
+
+### Required
+- [ ] Merge Request Title, and Description are up to date, accurate, and descriptive
+- [ ] MR targeting the appropriate branch
+- [ ] MR has a green pipeline on GitLab.com
+- [ ] Pipeline is green on the [dev.gitlab.org](https://dev.gitlab.org/gitlab/omnibus-gitlab/-/pipelines) mirror for this branch if the change is touching anything besides documentation or internal cookbooks. Please note that feature branches are not automatically mirrored to dev.gitlab.org, and should be manually pushed whenever necessary.
+- [ ] `trigger-package` has a green pipeline running against latest commit
+- [ ] When ready for review, MR is labeled "~workflow::ready for review" per the [Distribution MR workflow](https://about.gitlab.com/handbook/engineering/development/enablement/systems/distribution/merge_requests.html)
+
+### Expected (please provide an explanation if not completing)
+- [ ] Test plan indicating conditions for success has been posted and passes
+- [ ] Documentation created/updated
+- [ ] Tests added
+- [ ] Integration tests added to [GitLab QA](https://gitlab.com/gitlab-org/gitlab-qa)
+- [ ] Equivalent MR/issue for the [GitLab Chart](https://gitlab.com/gitlab-org/charts/gitlab) opened
+- [ ] Validate potential values for new configuration settings. Formats such as integer `10`, duration `10s`, URI `scheme://user:passwd@host:port` may require quotation or other special handling when rendered in a template and written to a configuration file.
diff --git a/.gitlab/merge_request_templates/Deprecated Configuration.md b/.gitlab/merge_request_templates/Deprecated Configuration.md
index 0a46020cddecd854c5159c81f38398842bb29996_LmdpdGxhYi9tZXJnZV9yZXF1ZXN0X3RlbXBsYXRlcy9EZXByZWNhdGVkIENvbmZpZ3VyYXRpb24ubWQ=..4bcba143b220e82ba312de4923b888e332a2038c_LmdpdGxhYi9tZXJnZV9yZXF1ZXN0X3RlbXBsYXRlcy9EZXByZWNhdGVkIENvbmZpZ3VyYXRpb24ubWQ= 100644
--- a/.gitlab/merge_request_templates/Deprecated Configuration.md	
+++ b/.gitlab/merge_request_templates/Deprecated Configuration.md	
@@ -3,8 +3,6 @@
 
 <!-- Briefly describe what this MR is about. -->
 
-%{first_multiline_commit}
-
 ## Related issues
 
 <!-- Link related issues below. Insert the issue link or reference after the word "Closes" if merging this should automatically close it. -->
diff --git a/.gitlab/merge_request_templates/Documentation update.md b/.gitlab/merge_request_templates/Documentation update.md
index 0a46020cddecd854c5159c81f38398842bb29996_LmdpdGxhYi9tZXJnZV9yZXF1ZXN0X3RlbXBsYXRlcy9Eb2N1bWVudGF0aW9uIHVwZGF0ZS5tZA==..4bcba143b220e82ba312de4923b888e332a2038c_LmdpdGxhYi9tZXJnZV9yZXF1ZXN0X3RlbXBsYXRlcy9Eb2N1bWVudGF0aW9uIHVwZGF0ZS5tZA== 100644
--- a/.gitlab/merge_request_templates/Documentation update.md	
+++ b/.gitlab/merge_request_templates/Documentation update.md	
@@ -2,8 +2,6 @@
 
 <!-- Briefly describe what this MR is about. -->
 
-%{first_multiline_commit}
-
 ## Related issues
 
 <!-- Link related issues below. -->
diff --git a/.gitlab/merge_request_templates/General Change.md b/.gitlab/merge_request_templates/General Change.md
deleted file mode 100644
index 0a46020cddecd854c5159c81f38398842bb29996_LmdpdGxhYi9tZXJnZV9yZXF1ZXN0X3RlbXBsYXRlcy9HZW5lcmFsIENoYW5nZS5tZA==..0000000000000000000000000000000000000000
--- a/.gitlab/merge_request_templates/General Change.md	
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- After merging changes to this template, update the `Default description template for merge requests` -->
-<!-- found under Settings - General Merge Requests -->
-## What does this MR do?
-
-<!-- Briefly describe what this MR is about. -->
-
-%{first_multiline_commit}
-
-## Related issues
-
-<!-- Link related issues below. Insert the issue link or reference after the word "Closes" if merging this should automatically close it. -->
-
-## Checklist
-
-See [Definition of done](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/CONTRIBUTING.md#definition-of-done).
-
-For anything in this list which will not be completed, please provide a reason in the MR discussion
-
-### Required
-- [ ] Merge Request Title, and Description are up to date, accurate, and descriptive
-- [ ] MR targeting the appropriate branch
-- [ ] MR has a green pipeline on GitLab.com
-- [ ] Pipeline is green on the [dev.gitlab.org](https://dev.gitlab.org/gitlab/omnibus-gitlab/-/pipelines) mirror for this branch if the change is touching anything besides documentation or internal cookbooks. Please note that feature branches are not automatically mirrored to dev.gitlab.org, and should be manually pushed whenever necessary.
-- [ ] `trigger-package` has a green pipeline running against latest commit
-- [ ] When ready for review, MR is labeled "~workflow::ready for review" per the [Distribution MR workflow](https://about.gitlab.com/handbook/engineering/development/enablement/systems/distribution/merge_requests.html)
-
-### Expected (please provide an explanation if not completing)
-- [ ] Test plan indicating conditions for success has been posted and passes
-- [ ] Documentation created/updated
-- [ ] Tests added
-- [ ] Integration tests added to [GitLab QA](https://gitlab.com/gitlab-org/gitlab-qa)
-- [ ] Equivalent MR/issue for the [GitLab Chart](https://gitlab.com/gitlab-org/charts/gitlab) opened
-- [ ] Validate potential values for new configuration settings. Formats such as integer `10`, duration `10s`, URI `scheme://user:passwd@host:port` may require quotation or other special handling when rendered in a template and written to a configuration file.