diff --git a/.circleci/config.yml b/.circleci/config.yml
index 816d5757eeb..df9e2cb71b7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -343,9 +343,5 @@ workflows:
           context: slack-secrets
           name: *name
           matrix: { parameters: { rails: ['6.0'], ruby: ['2.7'], database: ['sqlite'], paperclip: [true] } }
-      - test_solidus:
-          context: slack-secrets
-          name: *name
-          matrix: { parameters: { rails: ['5.2'], ruby: ['2.7'], database: ['sqlite'], paperclip: [true] } }
       - dev_tools:
           context: slack-secrets
diff --git a/api/app/controllers/spree/api/base_controller.rb b/api/app/controllers/spree/api/base_controller.rb
index e68b5db294f..ec48d666e52 100644
--- a/api/app/controllers/spree/api/base_controller.rb
+++ b/api/app/controllers/spree/api/base_controller.rb
@@ -10,7 +10,7 @@ class BaseController < ActionController::Base
       protect_from_forgery unless: -> { request.format.json? }
 
       include CanCan::ControllerAdditions
-      include Spree::Core::ControllerHelpers::CurrentHost
+      include ActiveStorage::SetCurrent
       include Spree::Core::ControllerHelpers::Store
       include Spree::Core::ControllerHelpers::Pricing
       include Spree::Core::ControllerHelpers::StrongParameters
diff --git a/core/app/controllers/spree/base_controller.rb b/core/app/controllers/spree/base_controller.rb
index fbdba199c08..31aea6bc3fc 100644
--- a/core/app/controllers/spree/base_controller.rb
+++ b/core/app/controllers/spree/base_controller.rb
@@ -4,7 +4,7 @@
 require_dependency 'spree/core/controller_helpers/strong_parameters'
 
 class Spree::BaseController < ApplicationController
-  include Spree::Core::ControllerHelpers::CurrentHost
+  include ActiveStorage::SetCurrent
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::PaymentParameters
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index d5666ab7c7a..f69671a4b9b 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -84,15 +84,6 @@ class GatewayError < RuntimeError; end
   end
 end
 
-if Gem::Version.new(Rails.version) < Gem::Version.new('6.0')
-  Spree::Deprecation.warn <<~HEREDOC
-    Rails 5.2 (EOL) is deprecated and will not be supported anymore from the next Solidus version.
-    Please, upgrade to a more recent Rails version.
-    Read more on upgrading from Rails 5.2 to Rails 6.0 here:
-    https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#upgrading-from-rails-5-2-to-rails-6-0
-  HEREDOC
-end
-
 require 'spree/core/version'
 
 require 'spree/core/active_merchant_dependencies'
@@ -117,7 +108,6 @@ class GatewayError < RuntimeError; end
 require 'spree/core/product_duplicator'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/common'
-require 'spree/core/controller_helpers/current_host'
 require 'spree/core/controller_helpers/order'
 require 'spree/core/controller_helpers/payment_parameters'
 require 'spree/core/controller_helpers/pricing'
diff --git a/core/lib/spree/core/controller_helpers/current_host.rb b/core/lib/spree/core/controller_helpers/current_host.rb
index 4a322b9b600..136f264bae9 100644
--- a/core/lib/spree/core/controller_helpers/current_host.rb
+++ b/core/lib/spree/core/controller_helpers/current_host.rb
@@ -7,7 +7,11 @@ module CurrentHost
         extend ActiveSupport::Concern
 
         included do
-          Spree::RailsCompatibility.active_storage_set_current(self)
+          Spree::Deprecation.warn <<~MSG
+            'Spree::Core::ControllerHelpers::CurrentHost' is deprecated.
+            Please, include 'ActiveStorage::SetCurrent' instead.
+          MSG
+          include ActiveStorage::SetCurrent
         end
       end
     end
diff --git a/core/lib/spree/rails_compatibility.rb b/core/lib/spree/rails_compatibility.rb
index 508dd773a9a..a63e4fe3add 100644
--- a/core/lib/spree/rails_compatibility.rb
+++ b/core/lib/spree/rails_compatibility.rb
@@ -72,23 +72,6 @@ def self.default_taxon_attachment_module
       end
     end
 
-    # Set current host for ActiveStorage in a controller
-    #
-    # Changed from `#host` to including a module in Rails 6
-    #
-    # See https://github.com/rails/rails/commit/e33c3cd8ccbecaca6c6af0438956431b02cb3fb2
-    #
-    # TODO: Remove when deprecating Rails 5.2
-    def self.active_storage_set_current(controller)
-      if version_gte?('6')
-        controller.include ActiveStorage::SetCurrent
-      else
-        controller.before_action do
-          ActiveStorage::Current.host = request.base_url
-        end
-      end
-    end
-
     # Set current host for ActiveStorage
     #
     # Changed from `#host` to `#url_options` on Rails 7
diff --git a/core/solidus_core.gemspec b/core/solidus_core.gemspec
index e0d825c943a..e21eb2bef5e 100644
--- a/core/solidus_core.gemspec
+++ b/core/solidus_core.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     actionmailer actionpack actionview activejob activemodel activerecord
     activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, ['>= 5.2', '< 7.1.x']
+    s.add_dependency rails_dep, ['>= 6.0', '< 7.1.x']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'
diff --git a/core/spec/lib/spree/core/controller_helpers/current_host_spec.rb b/core/spec/lib/spree/core/controller_helpers/current_host_spec.rb
new file mode 100644
index 00000000000..58991f8593f
--- /dev/null
+++ b/core/spec/lib/spree/core/controller_helpers/current_host_spec.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'spree/core/controller_helpers/current_host'
+
+RSpec.describe Spree::Core::ControllerHelpers::CurrentHost do
+  it 'is deprecated' do
+    expect(Spree::Deprecation).to receive(:warn).with(/'#{described_class.name}' is deprecated/)
+
+    Class.new(ApplicationController).include(described_class)
+  end
+
+  it 'includes ActiveStorage::SetCurrent module' do
+    Spree::Deprecation.silence do
+      mod = Class.new(ApplicationController).include(described_class)
+
+      expect(mod.ancestors).to include(ActiveStorage::SetCurrent)
+    end
+  end
+end