diff --git a/doc/administration/job_artifacts.md b/doc/administration/job_artifacts.md
index 9e8443ef241..079f55d2444 100644
--- a/doc/administration/job_artifacts.md
+++ b/doc/administration/job_artifacts.md
@@ -1,6 +1,6 @@
 ---
 stage: Verify
-group: Pipeline Execution
+group: Testing
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 type: reference, howto
 ---
diff --git a/doc/api/group_level_variables.md b/doc/api/group_level_variables.md
index 799b9542a51..4580a6a593e 100644
--- a/doc/api/group_level_variables.md
+++ b/doc/api/group_level_variables.md
@@ -1,6 +1,6 @@
 ---
 stage: Verify
-group: Pipeline Execution
+group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
diff --git a/doc/api/instance_level_ci_variables.md b/doc/api/instance_level_ci_variables.md
index 5f4a5891ea5..1e84399c6e7 100644
--- a/doc/api/instance_level_ci_variables.md
+++ b/doc/api/instance_level_ci_variables.md
@@ -1,6 +1,6 @@
 ---
 stage: Verify
-group: Pipeline Execution
+group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
diff --git a/doc/api/job_artifacts.md b/doc/api/job_artifacts.md
index 8da5507c55c..54404559577 100644
--- a/doc/api/job_artifacts.md
+++ b/doc/api/job_artifacts.md
@@ -1,6 +1,6 @@
 ---
 stage: Verify
-group: Pipeline Execution
+group: Testing
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
diff --git a/doc/api/project_level_variables.md b/doc/api/project_level_variables.md
index f49238c72af..bf44d0c14de 100644
--- a/doc/api/project_level_variables.md
+++ b/doc/api/project_level_variables.md
@@ -1,6 +1,6 @@
 ---
 stage: Verify
-group: Pipeline Execution
+group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 type: reference, api
 ---
diff --git a/doc/api/templates/gitlab_ci_ymls.md b/doc/api/templates/gitlab_ci_ymls.md
index ea519e9a993..388556d354f 100644
--- a/doc/api/templates/gitlab_ci_ymls.md
+++ b/doc/api/templates/gitlab_ci_ymls.md
@@ -1,6 +1,6 @@
 ---
 stage: Verify
-group: Pipeline Execution
+group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 type: reference
 ---
diff --git a/doc/ci/directed_acyclic_graph/index.md b/doc/ci/directed_acyclic_graph/index.md
index 6b7d1764285..e9725a29fc7 100644
--- a/doc/ci/directed_acyclic_graph/index.md
+++ b/doc/ci/directed_acyclic_graph/index.md
@@ -1,6 +1,6 @@
 ---
 stage: Verify
-group: Pipeline Execution
+group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 type: reference
 ---
diff --git a/doc/ci/migration/circleci.md b/doc/ci/migration/circleci.md
index a6bdbd043b6..ba67ec0d0d1 100644
--- a/doc/ci/migration/circleci.md
+++ b/doc/ci/migration/circleci.md
@@ -6,7 +6,7 @@ comments: false
 type: index, howto
 ---
 
-# Migrating from CircleCI
+# Migrating from CircleCI **(FREE)**
 
 If you are currently using CircleCI, you can migrate your CI/CD pipelines to [GitLab CI/CD](../introduction/index.md),
 and start making use of all its powerful features. Check out our
diff --git a/doc/ci/migration/jenkins.md b/doc/ci/migration/jenkins.md
index 005809879fa..41dba1a2b77 100644
--- a/doc/ci/migration/jenkins.md
+++ b/doc/ci/migration/jenkins.md
@@ -6,7 +6,7 @@ comments: false
 type: index, howto
 ---
 
-# Migrating from Jenkins
+# Migrating from Jenkins **(FREE)**
 
 A lot of GitLab users have successfully migrated to GitLab CI/CD from Jenkins. To make this
 easier if you're just getting started, we've collected several resources here that you might find useful
diff --git a/doc/ci/pipelines/job_artifacts.md b/doc/ci/pipelines/job_artifacts.md
index 6988fb1697f..b5150b9d1b7 100644
--- a/doc/ci/pipelines/job_artifacts.md
+++ b/doc/ci/pipelines/job_artifacts.md
@@ -1,12 +1,12 @@
 ---
 stage: Verify
-group: Pipeline Execution
+group: Testing
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 disqus_identifier: 'https://docs.gitlab.com/ee/user/project/pipelines/job_artifacts.html'
 type: reference, howto
 ---
 
-# Job artifacts
+# Job artifacts **(FREE)**
 
 > Introduced in [GitLab 12.4](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16675), artifacts in internal and private projects can be previewed when [GitLab Pages access control](../../administration/pages/index.md#access-control) is enabled.
 
diff --git a/doc/ci/pipelines/pipeline_architectures.md b/doc/ci/pipelines/pipeline_architectures.md
index 3a9cdb60861..78031ec1d97 100644
--- a/doc/ci/pipelines/pipeline_architectures.md
+++ b/doc/ci/pipelines/pipeline_architectures.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference
 ---
 
-# Pipeline Architecture
+# Pipeline architecture **(FREE)**
 
 Pipelines are the fundamental building blocks for CI/CD in GitLab. This page documents
 some of the important concepts related to them.
diff --git a/doc/ci/pipelines/pipeline_artifacts.md b/doc/ci/pipelines/pipeline_artifacts.md
index 3a8886c664b..b58c0e1c768 100644
--- a/doc/ci/pipelines/pipeline_artifacts.md
+++ b/doc/ci/pipelines/pipeline_artifacts.md
@@ -1,11 +1,11 @@
 ---
 stage: Verify
-group: Pipeline Execution
+group: Testing
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 type: reference, howto
 ---
 
-# Pipeline artifacts
+# Pipeline artifacts **(FREE)**
 
 Pipeline artifacts are files created by GitLab after a pipeline finishes. These are different than [job artifacts](job_artifacts.md) because they are not explicitly managed by the `.gitlab-ci.yml` definitions.
 
diff --git a/doc/ci/pipelines/pipeline_efficiency.md b/doc/ci/pipelines/pipeline_efficiency.md
index 1b8ee08f3b3..5bb435dddf6 100644
--- a/doc/ci/pipelines/pipeline_efficiency.md
+++ b/doc/ci/pipelines/pipeline_efficiency.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference
 ---
 
-# Pipeline Efficiency
+# Pipeline efficiency **(FREE)**
 
 [CI/CD Pipelines](index.md) are the fundamental building blocks for [GitLab CI/CD](../README.md).
 Making pipelines more efficient helps you save developer time, which:
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 45c867abb09..639786ada77 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -1,6 +1,6 @@
 ---
 stage: Verify
-group: Pipeline Execution
+group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 type: reference
 ---
diff --git a/doc/ci/variables/predefined_variables.md b/doc/ci/variables/predefined_variables.md
index 8ae79e189d0..f4fd93f8d4a 100644
--- a/doc/ci/variables/predefined_variables.md
+++ b/doc/ci/variables/predefined_variables.md
@@ -1,6 +1,6 @@
 ---
 stage: Verify
-group: Pipeline Execution
+group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 type: reference
 ---
diff --git a/doc/ci/variables/where_variables_can_be_used.md b/doc/ci/variables/where_variables_can_be_used.md
index c2a02be6c17..ea54891a99b 100644
--- a/doc/ci/variables/where_variables_can_be_used.md
+++ b/doc/ci/variables/where_variables_can_be_used.md
@@ -1,6 +1,6 @@
 ---
 stage: Verify
-group: Pipeline Execution
+group: Pipeline Authoring
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 type: reference
 ---
diff --git a/doc/security/password_length_limits.md b/doc/security/password_length_limits.md
index 05ddb0a2823..f637aebdcbe 100644
--- a/doc/security/password_length_limits.md
+++ b/doc/security/password_length_limits.md
@@ -5,12 +5,12 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference, howto
 ---
 
-# Custom password length limits
+# Custom password length limits **(FREE SELF)**
 
-By default, GitLab supports passwords with:
+By default, GitLab supports passwords with the following lengths:
 
-- A minimum length of 8.
-- A maximum length of 128.
+- Minimum: 8 characters
+- Maximum: 128 characters
 
 GitLab administrators can modify password lengths:
 
@@ -29,11 +29,12 @@ The user password length is set to a minimum of 8 characters by default.
 
 To change the minimum password length using GitLab UI:
 
-1. Go to **Admin Area > Settings**, then select **Sign-up restrictions**.
+1. Go to the Admin Area (**{admin}**) and select **Settings > Sign-up restrictions**.
 
    ![Minimum password length settings](../user/admin_area/img/minimum_password_length_settings_v12_6.png)
 
-1. Input a **Minimum password length** value greater than or equal to 8, then select **Save changes**.
+1. Enter a **Minimum password length** value greater than or equal to `8`.
+1. Select **Save changes**.
 
 ## Modify maximum password length using configuration file
 
diff --git a/doc/security/password_storage.md b/doc/security/password_storage.md
index af4b57e342a..260b60a4ad3 100644
--- a/doc/security/password_storage.md
+++ b/doc/security/password_storage.md
@@ -1,11 +1,11 @@
 ---
-stage: none
-group: unassigned
+stage: Manage
+group: Access
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 type: reference
 ---
 
-# Password Storage
+# Password storage **(FREE)**
 
 GitLab stores user passwords in a hashed format, to prevent passwords from being visible.
 
diff --git a/doc/security/passwords_for_integrated_authentication_methods.md b/doc/security/passwords_for_integrated_authentication_methods.md
index 9b1664f0e8c..7c4ada4435c 100644
--- a/doc/security/passwords_for_integrated_authentication_methods.md
+++ b/doc/security/passwords_for_integrated_authentication_methods.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference
 ---
 
-# Generated passwords for users created through integrated authentication
+# Generated passwords for users created through integrated authentication **(FREE)**
 
 GitLab allows users to set up accounts through integration with external [authentication and authorization providers](../administration/auth/README.md).
 
diff --git a/doc/security/two_factor_authentication.md b/doc/security/two_factor_authentication.md
index f2728f95b96..07faaff119c 100644
--- a/doc/security/two_factor_authentication.md
+++ b/doc/security/two_factor_authentication.md
@@ -77,11 +77,6 @@ Disabling 2FA for everyone does not disable the [enforce 2FA for all users](#enf
 or [enforce 2FA for all users in a group](#enforcing-2fa-for-all-users-in-a-group)
 settings. In addition to the steps in this section, you must disable any enforced 2FA
 settings so users aren't asked to set up 2FA again, the next time the user signs in to GitLab.
-Disabling 2FA for everyone does not disable the [enforce 2FA for all users](#enforcing-2fa-for-all-users)
-or [enforce 2FA for all users in a group](#enforcing-2fa-for-all-users-in-a-group)
-settings if they have been configured. In addition to the steps in this section,
-you must disable any enforced 2FA settings so users aren't asked to setup
-2FA again when the next login to GitLab.
 
 There may be some special situations where you want to disable 2FA for everyone
 even when forced 2FA is disabled. There is a Rake task for that:
diff --git a/doc/user/project/merge_requests/code_quality.md b/doc/user/project/merge_requests/code_quality.md
index 7ffd4871f09..5d99cd4ea87 100644
--- a/doc/user/project/merge_requests/code_quality.md
+++ b/doc/user/project/merge_requests/code_quality.md
@@ -1,6 +1,6 @@
 ---
-stage: Verify
-group: Testing
+stage: Secure
+group: Static Analysis
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 type: reference, howto
 ---
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index f9303f22907..0a47b93773b 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -506,7 +506,7 @@ RSpec.describe API::Groups do
       end
 
       it "does not return a non existing group" do
-        get api("/groups/1328", user1)
+        get api("/groups/#{non_existing_record_id}", user1)
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -586,7 +586,7 @@ RSpec.describe API::Groups do
       end
 
       it "does not return a non existing group" do
-        get api("/groups/1328", admin)
+        get api("/groups/#{non_existing_record_id}", admin)
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -729,7 +729,7 @@ RSpec.describe API::Groups do
       end
 
       it 'returns 404 for a non existing group' do
-        put api('/groups/1328', user1), params: { name: new_group_name }
+        put api("/groups/#{non_existing_record_id}", user1), params: { name: new_group_name }
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -954,7 +954,7 @@ RSpec.describe API::Groups do
       end
 
       it "does not return a non existing group" do
-        get api("/groups/1328/projects", user1)
+        get api("/groups/#{non_existing_record_id}/projects", user1)
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -1008,7 +1008,7 @@ RSpec.describe API::Groups do
       end
 
       it "does not return a non existing group" do
-        get api("/groups/1328/projects", admin)
+        get api("/groups/#{non_existing_record_id}/projects", admin)
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -1667,7 +1667,7 @@ RSpec.describe API::Groups do
       end
 
       it "does not remove a non existing group" do
-        delete api("/groups/1328", user1)
+        delete api("/groups/#{non_existing_record_id}", user1)
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -1687,7 +1687,7 @@ RSpec.describe API::Groups do
       end
 
       it "does not remove a non existing group" do
-        delete api("/groups/1328", admin)
+        delete api("/groups/#{non_existing_record_id}", admin)
 
         expect(response).to have_gitlab_http_status(:not_found)
       end