diff --git a/service/lib/agama/storage/finisher.rb b/service/lib/agama/storage/finisher.rb
index 3a37feb5f9..6d97f1d88e 100644
--- a/service/lib/agama/storage/finisher.rb
+++ b/service/lib/agama/storage/finisher.rb
@@ -146,7 +146,8 @@ def run?
 
         def run
           glob_files.each do |file|
-            target = File.dirname(file).sub(root_dir, dest_dir)
+            relative_path = File.dirname(file).delete_prefix(root_dir)
+            target = File.join(dest_dir, relative_path)
 
             FileUtils.mkdir_p(target)
             FileUtils.cp(file, target)
diff --git a/service/package/rubygem-agama-yast.changes b/service/package/rubygem-agama-yast.changes
index 317319054f..3340fa8147 100644
--- a/service/package/rubygem-agama-yast.changes
+++ b/service/package/rubygem-agama-yast.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May  6 06:09:24 UTC 2025 - Knut Anderssen <kanderssen@suse.com>
+
+- Fix the target path for copying the udev rules and nvme files
+  introduced by (bsc#123808, gh#agama-project/agama#2257).
+  (bsc#1241868, gh#agama-project/agama#2328).
+
 -------------------------------------------------------------------
 Tue Apr 22 14:14:52 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 
diff --git a/service/test/agama/storage/finisher_test.rb b/service/test/agama/storage/finisher_test.rb
index e3232fe6f8..b63775d3d7 100644
--- a/service/test/agama/storage/finisher_test.rb
+++ b/service/test/agama/storage/finisher_test.rb
@@ -78,7 +78,7 @@
     subject { copy_files }
     before do
       allow(Yast::Installation).to receive(:destdir).and_return(destdir)
-      allow(subject).to receive(:root_dir).and_return(File.join(FIXTURES_PATH, "root_dir"))
+      allow(subject).to receive(:root_dir).and_return(File.join(FIXTURES_PATH, "root_dir/"))
     end
 
     around do |block|