diff --git a/spec/lib/service_ping/build_payload_spec.rb b/spec/lib/service_ping/build_payload_spec.rb
index 6699310681add45a3384c263749290f6bbd30cd0..8d2b5311be34434a442a27140ea4d8e563e23ebf 100644
--- a/spec/lib/service_ping/build_payload_spec.rb
+++ b/spec/lib/service_ping/build_payload_spec.rb
@@ -3,7 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe ServicePing::BuildPayload, feature_category: :service_ping do
-  describe '#execute', :without_license do
+  describe '#execute', :without_license,
+    quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/438582' do
     subject(:service_ping_payload) { described_class.new.execute }
 
     include_context 'stubbed service ping metrics definitions'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3dfc27b8511dfa99b2e7656e9418926480bd5b89..d08f6ef9d0dd0eefabb88e7e848d7d659e50b905 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -223,6 +223,14 @@
       example.metadata[:retry] = 1
     end
 
+    # Gradually stop using rspec-retry
+    # See https://gitlab.com/gitlab-org/gitlab/-/issues/438388
+    %i[lib migrations models requests services].each do |type|
+      config.prepend_before(:each, type: type) do |example|
+        example.metadata[:retry] = 1
+      end
+    end
+
     config.exceptions_to_hard_fail = [DeprecationToolkitEnv::DeprecationBehaviors::SelectiveRaise::RaiseDisallowedDeprecation]
   end