diff --git a/.gitignore b/.gitignore
index 9a1367c..a6f4602 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,3 @@
-/sof-bin-72a04d5.tar.gz
-/sof-bin-topology-1.5-dmic-20db-fix.tar.gz
-/sof-bin-e6d11bf.tar.gz
-/sof-bin-47b436a.tar.gz
-/sof-bin-da8cb04.tar.gz
-/sof-bin-faa5bdc.tar.gz
-/sof-bin-b77c851.tar.gz
-/sof-bin-f31c9ce.tar.gz
-/sof-bin-6bd5501.tar.gz
-/sof-bin-v1.8.tar.gz
-/sof-bin-v1.9.tar.gz
-/sof-bin-v1.9.2.tar.gz
-/sof-bin-v1.9.3.tar.gz
-/sof-bin-v2.0.tar.gz
-/sof-tplg-v2.1.1a.tar.gz
-/alsa-sof-firmware-2.1.1-1.fc37.src.rpm
-/sof-bin-v2.1.1.tar.gz
-/sof-bin-v2.2.2.tar.gz
-/sof-bin-v2.2.3.tar.gz
-/sof-bin-v2.2.4.tar.gz
-/sof-bin-v2.2.5.tar.gz
-/sof-bin-v2.2.6.tar.gz
-/sof-bin-2023.09.tar.gz
-/sof-bin-2023.09.1.tar.gz
-/sof-bin-2023.09.2.tar.gz
++/sof-bin-*.tar.gz
++/sof-tplg-*.tar.gz
++/avs-topology_*.tar.gz
diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec
index cc48e61..075f96e 100644
--- a/alsa-sof-firmware.spec
+++ b/alsa-sof-firmware.spec
@@ -1,10 +1,11 @@
-# This is a firmware package, so binaries (which are not run on the host)
-# in the end package are expected.
+# This is a firmware package, so binaries (which are not run on the host) in
+# the end package are expected.
 %define _binaries_in_noarch_packages_terminate_build   0
 %global _firmwarepath  /usr/lib/firmware
 %global _xz_opts -9 --check=crc32
 
-%global sof_ver 2023.12
+%global sof_ver 2024.03
+%global sof_ver_avs 2024.02
 #global sof_ver_pre rc1
 %global sof_ver_rel %{?sof_ver_pre:.%{sof_ver_pre}}
 %global sof_ver_pkg0 %{sof_ver}%{?sof_ver_pre:-%{sof_ver_pre}}
@@ -18,13 +19,14 @@
 Summary:        Firmware and topology files for Sound Open Firmware project
 Name:           alsa-sof-firmware
 Version:        %{sof_ver}
-Release:        3%{?sof_ver_rel}%{?dist}
+Release:        5%{?sof_ver_rel}%{?dist}
 # See later in the spec for a breakdown of licensing
-License:        BSD-3-Clause
+License:        BSD-3-Clause AND Apache-2.0
 URL:            https://github.com/thesofproject/sof-bin
 Source:         https://github.com/thesofproject/sof-bin/releases/download/%{sof_ver_pkg}/sof-bin-%{sof_ver_pkg0}.tar.gz
+Source2:        https://github.com/thesofproject/avs-topology-xml/releases/download/v%{sof_ver_avs}/avs-topology_%{sof_ver_avs}.tar.gz
 %if 0%{?with_sof_addon}
-Source2:        https://github.com/thesofproject/sof-bin/releases/download/v%{sof_ver_addon}/sof-tplg-v%{sof_ver_addon}.tar.gz
+Source3:        https://github.com/thesofproject/sof-bin/releases/download/v%{sof_ver_addon}/sof-tplg-v%{sof_ver_addon}.tar.gz
 %endif
 BuildRequires:  alsa-topology >= %{tplg_version}
 BuildRequires:  alsa-topology-utils >= %{tplg_version}
@@ -49,12 +51,20 @@ This package contains the debug files for the Sound Open Firmware project.
 
 mkdir -p firmware/intel
 
-for d in sof sof-ipc4 sof-ace-tplg sof-tplg; do \
+for d in sof sof-ipc4 sof-ipc4-tplg sof-tplg; do \
   mv "${d}" firmware/intel; \
 done
 
+ln -s sof-ipc4-tplg firmware/intel/sof-ace-tplg
+
+mkdir avs
+tar xvzf %{SOURCE2} --strip-components=1 --directory=avs
+mv avs/LICENSE LICENCE.avs
+mv avs/lib/firmware/intel/avs firmware/intel
+echo "%{sof_ver_avs}" > manifest.avs.txt
+
 %if 0%{?with_sof_addon}
-tar xvzf %{SOURCE2}
+tar xvzf %{SOURCE3}
 mv sof-tplg-v%{sof_ver_addon}/*.tplg firmware/intel/sof-tplg
 %endif
 
@@ -79,9 +89,12 @@ for d in sof sof-ipc4; do \
     popd; \
   done
 done
-for d in sof-tplg sof-ace-tplg; do \
+for d in sof-tplg sof-ipc4-tplg; do \
   find -P "firmware/intel/${d}"  -type f -name "*.tplg" -exec xz -z %{_xz_opts} {} \;
 done
+for d in avs; do \
+  find -P "firmware/intel/${d}"  -type f -name "*.bin" -exec xz -z %{_xz_opts} {} \;
+done
 
 %build
 # SST topology files (not SOF related, but it's a Intel hw support
@@ -113,6 +126,7 @@ cat alsa-sof-firmware.files
 %license LICENCE*
 %doc README*
 %doc manifest.txt.xz
+%doc manifest.avs.txt
 %dir %{_firmwarepath}
 
 # Licence: 3-clause BSD
@@ -121,7 +135,11 @@ cat alsa-sof-firmware.files
 # Licence: 3-clause BSD
 # .. for files with suffix .tplg
 %{_firmwarepath}/intel/sof-tplg/*.tplg.xz
-%{_firmwarepath}/intel/sof-ace-tplg/*.tplg.xz
+%{_firmwarepath}/intel/sof-ipc4-tplg/*.tplg.xz
+%{_firmwarepath}/intel/sof-ace-tplg
+
+# Licence: Apache 2.0
+%{_firmwarepath}/intel/avs/*.bin.xz
 
 # Licence: SOF (3-clause BSD plus others)
 # .. for files with suffix .ri
@@ -135,7 +153,18 @@ if st and st.type == "link" then
   os.remove(path)
 end
 
+path1 = "%{_firmwarepath}/intel/sof-ace-tplg"
+path2 = "%{_firmwarepath}/intel/sof-ipc4-tplg"
+st = posix.stat(path1)
+if st and st.type == "directory" then
+  os.rename(path1, path2)
+end
+
 %changelog
+* Mon Jun 17 2024 Jaroslav Kysela <perex@perex.cz> - 2024.03-5
+- Update to v2024.03
+- Add AVS topology files v2024.02
+
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2023.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..4ca9235
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/sources b/sources
index 3ed4cb5..e67be8d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (sof-bin-2023.12.tar.gz) = ed43e7597c93140b15499ba17bae1866dcf1e2959d910e81b3831e4db2224a1dcff790ef21afcd610d7cc9309251a08351bae1c959ded18e5e28a6b24ae99506
+SHA512 (sof-bin-2024.03.tar.gz) = 1e9891d3891f5a4413a77a68ea6d3a2e6ead8c1a67eaa7e9aaf30871753617ffce19bd3b85ebcbb617e606646f6aa0e1dafee5279c294ec72ef4b2885e009f72
+SHA512 (avs-topology_2024.02.tar.gz) = b7ebce9a6893e44d3c4a41c8e15818f7dac9d3e246c724e9a48514e40e6c43f1791a947b4560fe5ce6eb135232bf5ea8fb1a4d84f83442b7c777e341c977e134