diff --git a/linux-firmware/PKGBUILD b/linux-firmware/PKGBUILD
index 4f2787b..3fbc5f9 100644
--- a/linux-firmware/PKGBUILD
+++ b/linux-firmware/PKGBUILD
@@ -8,14 +8,16 @@
 pkgbase=linux-firmware
 pkgname=(linux-firmware-whence linux-firmware amd-ucode
          linux-firmware-{nfp,mellanox,marvell,qcom,liquidio,qlogic,bnx2x})
-_tag=20240115
-pkgver=20240115.9b6d0b08
+_tag=20240312
+pkgver=20240312.3b128b60
 pkgrel=01
 pkgdesc="Firmware files for Linux"
-url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
+#url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
+url="https://gitlab.com/kernel-firmware/linux-firmware"
 makedepends=(git rdfind)
 options=(!strip)
-source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#tag=${_tag}?signed")
+#source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#tag=${_tag}?signed")
+source=("git+$url.git?signed#tag=${_tag}")
 
 #_backports=(
 #  f2eb058afc57348cde66852272d6bf11da1eef8f  # fixes for "inception": https://www.amd.com/en/resources/product-security/bulletin/amd-sb-7005.html
@@ -29,9 +31,6 @@ prepare() {
     git log --oneline -1 "${_c}"
     git cherry-pick -n "${_c}"
   done
-
-#  # add firmware compression support - patch taken from Fedora
-#  patch -Np1 -i ../0001-Add-support-for-compressing-firmware-in-copy-firmware.patch
 }
 
 pkgver() {
@@ -92,9 +91,12 @@ package_linux-firmware() {
   cd "${pkgdir}"
 
   # remove arm64 firmware https://bugs.archlinux.org/task/76583
+  # it is .xz not zst 
   rm usr/lib/firmware/mrvl/prestera/mvsw_prestera_fw_arm64-v4.1.img.xz
 
   # split
+  _pick amd-ucode usr/lib/firmware/amd-ucode
+
   _pick linux-firmware-nfp usr/lib/firmware/netronome
   _pick linux-firmware-nfp usr/share/licenses/${pkgname}/LICENCE.Netronome
 
@@ -119,6 +121,8 @@ package_amd-ucode() {
   pkgdesc="Microcode update image for AMD CPUs"
   license=(custom)
 
+  mv -v $pkgname/* "$pkgdir"
+
   install -Dt "${pkgdir}/boot" -m644 amd-ucode.img
 
   install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 ${pkgbase}/LICENSE.amd-ucode
@@ -183,14 +187,14 @@ validpgpkeys=(4CDE8575E547BF835FE15807A31B6BD72486CFD6) # Josh Boyer <jwboyer@fe
 
 sha256sums=(SKIP) # linux-firmware
 
-##  f73dbb532d95917fee85e8f5a77cb3e84a3f5640fc549b94da426a2cb62f66ff  amd-ucode-20240115.9b6d0b08-01-x86_64.pkg.tar.lz
-##  ba078dbfce98772c27d55b01963cf955c388e94fe8b903cbf000839b5e251d05  linux-firmware-20240115.9b6d0b08-01-x86_64.pkg.tar.lz
-##  ae6bc3ec9f944a089733735f6b93272db38137105026aadb293df6a3789b8ed2  linux-firmware-bnx2x-20240115.9b6d0b08-01-x86_64.pkg.tar.lz
-##  fe202cd7d57f343cc4788a928eda17f2c7bb9ab0b1813bdbe263c55186707cff  linux-firmware-liquidio-20240115.9b6d0b08-01-x86_64.pkg.tar.lz
-##  5bbc5fd62e14b962e5781e79b3d18d300cc59dab2e3a07745f71d850ff797719  linux-firmware-marvell-20240115.9b6d0b08-01-x86_64.pkg.tar.lz
-##  56d1124e5b9aff4c2b6edb1df8c0b5108818a5f7cb07c9595168063d04ec0833  linux-firmware-mellanox-20240115.9b6d0b08-01-x86_64.pkg.tar.lz
-##  9b7ba6ec5f07ac711c5760a3110f7b355b2c1e586d460223b7302a6d0cd15984  linux-firmware-nfp-20240115.9b6d0b08-01-x86_64.pkg.tar.lz
-##  6c301deb89dc72aab55444b74dc32885f02bcc1f24acd6aea5b78a0a11162bde  linux-firmware-qcom-20240115.9b6d0b08-01-x86_64.pkg.tar.lz
-##  48159275369b11c9d7454937bac863d3c20c0dd81cf099e7b9dd15950d4a8243  linux-firmware-qlogic-20240115.9b6d0b08-01-x86_64.pkg.tar.lz
-##  25526fe8bd30b1d5345d63aa90739283432dd026e23d4b4a9fbf2c31242e2a60  linux-firmware-whence-20240115.9b6d0b08-01-x86_64.pkg.tar.lz
+##  d2d1f18661c09fb8eee39aed2d36fd27dc9e500b3b92912173017622c3114943  amd-ucode-20240312.3b128b60-01-x86_64.pkg.tar.lz
+##  fec9bb8a28d56fa892ae34d3d2246a6a243e760c021588a087edd17803d9ed23  linux-firmware-20240312.3b128b60-01-x86_64.pkg.tar.lz
+##  3ee05b7aa71ce90cbb336cf66b78b457191c47ce0dbd7d495c9c99fcf7a42249  linux-firmware-bnx2x-20240312.3b128b60-01-x86_64.pkg.tar.lz
+##  762f12404c5fa1293201ed42ea36423d69e850bc20fd82d658b445d28d0689e5  linux-firmware-liquidio-20240312.3b128b60-01-x86_64.pkg.tar.lz
+##  4ce424ffd63b0c9e53c302af8b2d7b1e85f531b56d8badd846b9657ebdb86c0a  linux-firmware-marvell-20240312.3b128b60-01-x86_64.pkg.tar.lz
+##  a2bf4f5feb5017f693975716fbfdd595aae14f9a795f532bc942c2dd1597d9fe  linux-firmware-mellanox-20240312.3b128b60-01-x86_64.pkg.tar.lz
+##  0894e9fedb761964f04344151961b84717611e4aab7061e8fa93ef475cd857b8  linux-firmware-nfp-20240312.3b128b60-01-x86_64.pkg.tar.lz
+##  5a08aa4bf29aa9beeeef7006f78fec76b598a993ad0f4e9bda37fb6a1510ff26  linux-firmware-qcom-20240312.3b128b60-01-x86_64.pkg.tar.lz
+##  8436bac6073aaf7d9f26d9ef908a696a756dc059cde2e77ee0474475c92ec619  linux-firmware-qlogic-20240312.3b128b60-01-x86_64.pkg.tar.lz
+##  ba762663f483b80f9d00dc50cbe50521db56357e0bad570d98baf2959a5d5821  linux-firmware-whence-20240312.3b128b60-01-x86_64.pkg.tar.lz
 
diff --git a/linux-firmware/PKGBUILD-arch b/linux-firmware/PKGBUILD-arch
index 2afa665..151114d 100644
--- a/linux-firmware/PKGBUILD-arch
+++ b/linux-firmware/PKGBUILD-arch
@@ -5,16 +5,16 @@ pkgbase=linux-firmware
 pkgname=(linux-firmware-whence linux-firmware amd-ucode
          linux-firmware-{nfp,mellanox,marvell,qcom,liquidio,qlogic,bnx2x}
 )
-_tag=20240115
-pkgver=20240115.9b6d0b08
+_tag=20240312
+pkgver=20240312.3b128b60
 pkgrel=1
 pkgdesc="Firmware files for Linux"
-url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
+url="https://gitlab.com/kernel-firmware/linux-firmware"
 license=('GPL2' 'GPL3' 'custom')
 arch=('any')
 makedepends=('git' 'rdfind')
 options=(!strip)
-source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#tag=${_tag}?signed")
+source=("git+$url.git?signed#tag=${_tag}")
 sha256sums=('SKIP')
 validpgpkeys=('4CDE8575E547BF835FE15807A31B6BD72486CFD6') # Josh Boyer <jwboyer@fedoraproject.org>
 
@@ -84,6 +84,8 @@ package_linux-firmware() {
   rm usr/lib/firmware/mrvl/prestera/mvsw_prestera_fw_arm64-v4.1.img.zst
 
   # split
+  _pick amd-ucode usr/lib/firmware/amd-ucode
+
   _pick linux-firmware-nfp usr/lib/firmware/netronome
   _pick linux-firmware-nfp usr/share/licenses/${pkgname}/LICENCE.Netronome
 
@@ -108,6 +110,8 @@ package_amd-ucode() {
   pkgdesc="Microcode update image for AMD CPUs"
   license=(custom)
 
+  mv -v $pkgname/* "$pkgdir"
+
   install -Dt "${pkgdir}/boot" -m644 amd-ucode.img
 
   install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 ${pkgbase}/LICENSE.amd-ucode