diff --git a/Gemfile.lock b/Gemfile.lock
index 1f02aa3ad8..1dfd9a5d42 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -104,11 +104,12 @@ GEM
       rails-html-sanitizer (~> 1.6)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    active_storage_validations (1.1.4)
-      activejob (>= 5.2.0)
-      activemodel (>= 5.2.0)
-      activestorage (>= 5.2.0)
-      activesupport (>= 5.2.0)
+    active_storage_validations (3.0.2)
+      activejob (>= 6.1.4)
+      activemodel (>= 6.1.4)
+      activestorage (>= 6.1.4)
+      activesupport (>= 6.1.4)
+      marcel (>= 1.0.3)
     activejob (7.1.6)
       activesupport (= 7.1.6)
       globalid (>= 0.3.6)
diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index b36c3cb33e..c126b28984 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -110,14 +110,14 @@ class Enterprise < ApplicationRecord
   end
 
   validates :logo,
-            processable_image: true,
-            content_type: %r{\Aimage/(png|jpeg|gif|jpg|svg\+xml|webp)\Z}
+            processable_file: true,
+            content_type: ::Spree::Image::ACCEPTED_CONTENT_TYPES
   validates :promo_image,
-            processable_image: true,
-            content_type: %r{\Aimage/(png|jpeg|gif|jpg|svg\+xml|webp)\Z}
+            processable_file: true,
+            content_type: ::Spree::Image::ACCEPTED_CONTENT_TYPES
   validates :white_label_logo,
-            processable_image: true,
-            content_type: %r{\Aimage/(png|jpeg|gif|jpg|svg\+xml|webp)\Z}
+            processable_file: true,
+            content_type: ::Spree::Image::ACCEPTED_CONTENT_TYPES
   validates :terms_and_conditions, content_type: {
     in: "application/pdf",
     message: I18n.t(:enterprise_terms_and_conditions_type_error),
diff --git a/app/models/enterprise_group.rb b/app/models/enterprise_group.rb
index e6208e3000..cb2252b2d4 100644
--- a/app/models/enterprise_group.rb
+++ b/app/models/enterprise_group.rb
@@ -29,11 +29,11 @@ class EnterpriseGroup < ApplicationRecord
   has_one_attached :promo_image, service: image_service
 
   validates :logo,
-            processable_image: true,
-            content_type: %r{\Aimage/(png|jpeg|gif|jpg|svg\+xml|webp)\Z}
+            processable_file: true,
+            content_type: ::Spree::Image::ACCEPTED_CONTENT_TYPES
   validates :promo_image,
-            processable_image: true,
-            content_type: %r{\Aimage/(png|jpeg|gif|jpg|svg\+xml|webp)\Z}
+            processable_file: true,
+            content_type: ::Spree::Image::ACCEPTED_CONTENT_TYPES
 
   scope :by_position, -> { order('position ASC') }
   scope :on_front_page, -> { where(on_front_page: true) }
diff --git a/app/models/spree/image.rb b/app/models/spree/image.rb
index 350b1c5b4c..431b1679b0 100644
--- a/app/models/spree/image.rb
+++ b/app/models/spree/image.rb
@@ -2,6 +2,8 @@
 
 module Spree
   class Image < Asset
+    ACCEPTED_CONTENT_TYPES = %r{\Aimage/(png|jpeg|gif|jpg|svg\+xml|webp)\Z}
+
     has_one_attached :attachment, service: image_service do |attachment|
       attachment.variant :mini, resize_to_fill: [48, 48]
       attachment.variant :small, resize_to_fill: [227, 227]
@@ -11,8 +13,8 @@ module Spree
 
     validates :attachment,
               attached: true,
-              processable_image: true,
-              content_type: %r{\Aimage/(png|jpeg|gif|jpg|svg\+xml|webp)\Z}
+              processable_file: true,
+              content_type: ACCEPTED_CONTENT_TYPES
     validate :no_attachment_errors
 
     def self.default_image_url(size)
diff --git a/engines/dfc_provider/app/services/image_builder.rb b/engines/dfc_provider/app/services/image_builder.rb
index 06ab056e0c..798a5d0f38 100644
--- a/engines/dfc_provider/app/services/image_builder.rb
+++ b/engines/dfc_provider/app/services/image_builder.rb
@@ -19,7 +19,7 @@ class ImageBuilder < DfcBuilder
 
   def self.import(image_link)
     url = URI.parse(image_link)
-    filename = File.basename(image_link)
+    filename = File.basename(url.path)
     metadata = { custom: { origin: image_link } }
 
     Spree::Image.new.tap do |image|
diff --git a/engines/dfc_provider/spec/services/supplied_product_importer_spec.rb b/engines/dfc_provider/spec/services/supplied_product_importer_spec.rb
index 815a1c6897..07a8d1bbda 100644
--- a/engines/dfc_provider/spec/services/supplied_product_importer_spec.rb
+++ b/engines/dfc_provider/spec/services/supplied_product_importer_spec.rb
@@ -251,7 +251,7 @@ RSpec.describe SuppliedProductImporter do
         supplied_product.isVariantOf << tomatoes
 
         imported_product = importer.import_variant(supplied_product, supplier).product
-        expect(imported_product.image.attachment.filename).to eq "tomato.png?v=1"
+        expect(imported_product.image.attachment.filename).to eq "tomato.png"
 
         expect {
           importer.import_variant(supplied_product, supplier).product
@@ -266,7 +266,7 @@ RSpec.describe SuppliedProductImporter do
         }
           .to change { imported_product.image }
 
-        expect(imported_product.image.attachment.filename).to eq "tomato.png?v=2"
+        expect(imported_product.image.attachment.filename).to eq "tomato.png"
       end
 
       context "when spree_product_uri doesn't match the server host" do
diff --git a/spec/fixtures/files/logo.bmp b/spec/fixtures/files/logo.bmp
new file mode 100644
index 0000000000..f03e68b138
Binary files /dev/null and b/spec/fixtures/files/logo.bmp differ
diff --git a/spec/fixtures/vcr_cassettes/ImageImporter/_import/downloads_from_the_Internet.yml b/spec/fixtures/vcr_cassettes/ImageImporter/_import/downloads_from_the_Internet.yml
index 86808900fb..eb4760b32b 100644
--- a/spec/fixtures/vcr_cassettes/ImageImporter/_import/downloads_from_the_Internet.yml
+++ b/spec/fixtures/vcr_cassettes/ImageImporter/_import/downloads_from_the_Internet.yml
@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://s3.amazonaws.com/ofn_production/eofop2en1y6tu9fr1x9b0wzwgs5r
+    uri: https://s3.amazonaws.com/ofn_production/eofop2en1y6tu9fr1x9b0wzwgs5r.png
     body:
       encoding: US-ASCII
       string: ''
diff --git a/spec/models/enterprise_spec.rb b/spec/models/enterprise_spec.rb
index 8e990ca3bd..f2036329ed 100644
--- a/spec/models/enterprise_spec.rb
+++ b/spec/models/enterprise_spec.rb
@@ -391,24 +391,8 @@ RSpec.describe Enterprise do
       let(:content_type) { 'image/png' }
 
       before do
-        blob = instance_double(
-          "ActiveStorage::Blob",
-          filename: ActiveStorage::Filename.new('white-label-logo.png'),
-          content_type:,
-          byte_size: 1024
-        )
-
-        # InstanceDouble is not working for attachment case as the blob method is not yet defined
-        # on instantiation.
-        attachment = double(
-          "ActiveStorage::Attached::One",
-          blank?: false,
-          attached?: true,
-          blob:
-        )
-
-        allow(enterprise)
-          .to receive(:white_label_logo).and_return(attachment)
+        blob = Rack::Test::UploadedFile.new('spec/fixtures/files/logo.png', content_type)
+        enterprise.white_label_logo.attach(blob)
       end
 
       context 'when the file attached is a PNG image' do
@@ -419,6 +403,12 @@ RSpec.describe Enterprise do
 
       context 'when the file attached is a BMP image' do
         let(:content_type) { 'image/bmp' }
+
+        before do
+          blob = Rack::Test::UploadedFile.new('spec/fixtures/files/logo.bmp', content_type)
+          enterprise.white_label_logo.attach(blob)
+        end
+
         it 'is not valid' do
           expect(enterprise).not_to be_valid
         end
diff --git a/spec/services/image_importer_spec.rb b/spec/services/image_importer_spec.rb
index 67fa4793d2..d5cc88b375 100644
--- a/spec/services/image_importer_spec.rb
+++ b/spec/services/image_importer_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe ImageImporter do
-  let(:ofn_url) { "https://s3.amazonaws.com/ofn_production/eofop2en1y6tu9fr1x9b0wzwgs5r" }
+  let(:ofn_url) { "https://s3.amazonaws.com/ofn_production/eofop2en1y6tu9fr1x9b0wzwgs5r.png" }
   let(:product) { create(:product) }
 
   describe "#import" do
diff --git a/spec/system/admin/products_spec.rb b/spec/system/admin/products_spec.rb
index 8f10416261..93a699892b 100644
--- a/spec/system/admin/products_spec.rb
+++ b/spec/system/admin/products_spec.rb
@@ -604,7 +604,7 @@ RSpec.describe '
         click_button "Create"
 
         expect(page).to have_text "Attachment has an invalid content type"
-        expect(page).to have_text "Attachment is not a valid image"
+        expect(page).to have_text "Attachment is not identified as a valid media file"
       end
 
       it "deleting product images" do
diff --git a/spec/system/admin/products_v3/update_spec.rb b/spec/system/admin/products_v3/update_spec.rb
index 76e96b60eb..320f15d3b2 100644
--- a/spec/system/admin/products_v3/update_spec.rb
+++ b/spec/system/admin/products_v3/update_spec.rb
@@ -770,12 +770,12 @@ RSpec.describe 'As an enterprise user, I can update my products' do
         end
       end
 
-      it 'shows a modal telling not a valid image when uploading a non valid image file' do
+      it 'shows a modal telling not a valid image when uploading an invalid image file' do
         within ".reveal-modal" do
           attach_file 'image[attachment]',
                       Rails.public_path.join('invalid_image.jpg'),
                       visible: false
-          expect(page).to have_content /Attachment is not a valid image/
+          expect(page).to have_content /Attachment is not identified as a valid media file/
         end
       end
     end