diff --git a/kernel-firmware-nvidia.changes b/kernel-firmware-nvidia.changes
index 4f7cb50..41870db 100644
--- a/kernel-firmware-nvidia.changes
+++ b/kernel-firmware-nvidia.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 25 13:52:22 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Change conflicts filesystem < 84 to conflicts filesystem without
+  may-perform-usrmerge. Version 84 is specific to Tumbleweed; CODE
+  16 uses Version 16; yet we need to ensure we get an up-to-date
+  version of filesystem. Relying on the recently introduced provides
+  instructing zypp about the usrmerge is perfect for this use case.
+
 -------------------------------------------------------------------
 Tue Mar 25 07:22:31 UTC 2025 - Takashi Iwai <tiwai@suse.com>
 
diff --git a/kernel-firmware-nvidia.spec b/kernel-firmware-nvidia.spec
index 49a5688..e81d1e7 100644
--- a/kernel-firmware-nvidia.spec
+++ b/kernel-firmware-nvidia.spec
@@ -30,7 +30,7 @@ License:        GPL-2.0-or-later AND SUSE-Firmware
 Group:          System/Kernel
 URL:            https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
 Source0:        %{name}-%{version}.tar.xz
-Source1:        https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250325.tar.gz#/kernel-firmware-tools-20250325.tar.gz
+Source1:        https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250425.tar.gz#/kernel-firmware-tools-20250425.tar.gz
 Source2:        %{name}-rpmlintrc
 Source3:        git_id
 Source10:       aliases
@@ -44,8 +44,7 @@ Conflicts:      kernel < 5.3
 Conflicts:      kernel-firmware-uncompressed
 BuildArch:      noarch
 %if 0%{?suse_version} >= 1550
-# make sure we have post-usrmerge filesystem package on TW
-Conflicts:      filesystem < 84
+Conflicts:      (filesystem without may-perform-usrmerge)
 %endif
 Supplements:    modalias(of:N*T*Cnvidia%2Cgk20a)
 Supplements:    modalias(of:N*T*Cnvidia%2Cgk20aC*)
diff --git a/kernel-firmware-tools-20250325.tar.gz b/kernel-firmware-tools-20250325.tar.gz
deleted file mode 100644
index 7d20285..0000000
--- a/kernel-firmware-tools-20250325.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8e3b3646ce25e3d99c8394ed7deeabb5fe5907fb0645f7e90cceeb1c2136c0f
-size 16535
diff --git a/kernel-firmware-tools-20250425.tar.gz b/kernel-firmware-tools-20250425.tar.gz
new file mode 100644
index 0000000..a45f059
--- /dev/null
+++ b/kernel-firmware-tools-20250425.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7364202554baf494a3a469b17646832374b3651358c255627f99c4ec4a4338b6
+size 16848