diff --git a/.rubocop_todo/rspec/factory_bot/excessive_create_list.yml b/.rubocop_todo/rspec/factory_bot/excessive_create_list.yml
index 39aed947a48..640b0c7f400 100644
--- a/.rubocop_todo/rspec/factory_bot/excessive_create_list.yml
+++ b/.rubocop_todo/rspec/factory_bot/excessive_create_list.yml
@@ -14,11 +14,8 @@ RSpec/FactoryBot/ExcessiveCreateList:
     - 'ee/spec/support/protected_tags/access_control_shared_examples.rb'
     - 'ee/spec/support/shared_examples/features/protected_branches_access_control_shared_examples.rb'
     - 'ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb'
-    - 'spec/controllers/admin/clusters_controller_spec.rb'
     - 'spec/controllers/autocomplete_controller_spec.rb'
     - 'spec/controllers/explore/projects_controller_spec.rb'
-    - 'spec/controllers/groups/clusters_controller_spec.rb'
-    - 'spec/controllers/projects/clusters_controller_spec.rb'
     - 'spec/controllers/projects/feature_flags_controller_spec.rb'
     - 'spec/controllers/projects/hooks_controller_spec.rb'
     - 'spec/docs_screenshots/container_registry_docs.rb'
diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION
index dfe23a89900..ac9a44aa103 100644
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
@@ -1 +1 @@
-2a21892c80bd3b229073f091206247af66344dbe
+86dd2da4f0880e53cd987ab392173cd2c08aba00
diff --git a/spec/controllers/admin/clusters_controller_spec.rb b/spec/controllers/admin/clusters_controller_spec.rb
index 35bfb829bf7..83498295676 100644
--- a/spec/controllers/admin/clusters_controller_spec.rb
+++ b/spec/controllers/admin/clusters_controller_spec.rb
@@ -58,7 +58,8 @@ RSpec.describe Admin::ClustersController, feature_category: :deployment_manageme
           let(:total_count) { Clusters::Cluster.instance_type.page.total_count }
 
           before do
-            create_list(:cluster, 30, :provided_by_gcp, :production_environment, :instance)
+            allow(Clusters::Cluster).to receive(:default_per_page).and_return(1)
+            create_list(:cluster, 2, :provided_by_gcp, :production_environment, :instance)
           end
 
           it 'redirects to the page' do
diff --git a/spec/controllers/groups/clusters_controller_spec.rb b/spec/controllers/groups/clusters_controller_spec.rb
index 6c747d4f00f..16510c618ef 100644
--- a/spec/controllers/groups/clusters_controller_spec.rb
+++ b/spec/controllers/groups/clusters_controller_spec.rb
@@ -63,7 +63,8 @@ RSpec.describe Groups::ClustersController, feature_category: :deployment_managem
           let(:total_count) { group.clusters.page.total_count }
 
           before do
-            create_list(:cluster, 30, :provided_by_gcp, :production_environment, cluster_type: :group_type, groups: [group])
+            allow(Clusters::Cluster).to receive(:default_per_page).and_return(1)
+            create_list(:cluster, 2, :provided_by_gcp, :production_environment, cluster_type: :group_type, groups: [group])
           end
 
           it 'redirects to the page' do
diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb
index 15b7ddd85ea..55296ed3d5c 100644
--- a/spec/controllers/projects/clusters_controller_spec.rb
+++ b/spec/controllers/projects/clusters_controller_spec.rb
@@ -57,7 +57,8 @@ RSpec.describe Projects::ClustersController, feature_category: :deployment_manag
           let(:total_count) { project.clusters.page.total_count }
 
           before do
-            create_list(:cluster, 30, :provided_by_gcp, :production_environment, projects: [project])
+            allow(Clusters::Cluster).to receive(:default_per_page).and_return(1)
+            create_list(:cluster, 2, :provided_by_gcp, :production_environment, projects: [project])
           end
 
           it 'redirects to the page' do