diff --git a/bcm283x-firmware.spec b/bcm283x-firmware.spec
index 9c55482..d3c26a1 100644
--- a/bcm283x-firmware.spec
+++ b/bcm283x-firmware.spec
@@ -4,11 +4,11 @@
 # git clone https://github.com/raspberrypi/firmware.git
 # cd firmware/boot
 # tar cJvf ../bcm283x-firmware-%{gitshort}.tar.xz *bin *dat *elf bcm2709*dtb bcm271*dtb LICENCE.broadcom COPYING.linux overlays/
-%define gitshort f145afc
+%define gitshort c818048
 
 Name:          bcm283x-firmware
-Version:       20220527
-Release:       2.%{gitshort}%{?dist}
+Version:       20220718
+Release:       1.%{gitshort}%{?dist}
 Summary:       Firmware for the Broadcom bcm283x/bcm2711 used in the Raspberry Pi
 # see LICENSE.broadcom
 # DT Overlays covered under Linux Kernel GPLv2
@@ -86,7 +86,7 @@ install -p overlays/*.dtbo %{buildroot}%{efi_esp_root}/overlays
 %{efi_esp_root}/overlays
 
 %files -n bcm2835-firmware
-%{efi_esp_root}/bcm2709-rpi-2-b.dtb
+%{efi_esp_root}/bcm2709-rpi-*
 %{efi_esp_root}/bcm2710-rpi-*
 %{efi_esp_root}/fixup*
 %{efi_esp_root}/start*
@@ -99,6 +99,9 @@ install -p overlays/*.dtbo %{buildroot}%{efi_esp_root}/overlays
 %{efi_esp_root}/start4*
 
 %changelog
+* Mon Jul 18 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 20220718-1.c818048
+- Update to latest firmware
+
 * Sat Jun 11 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 20220527-2.f145afc
 - Updates for default config.txt
 
diff --git a/config-64.txt b/config-64.txt
index a04354c..16448f4 100644
--- a/config-64.txt
+++ b/config-64.txt
@@ -56,8 +56,7 @@ gpu_mem=32
 # Use eXtended firmware by default
 start_x=1
 
-# Enable audio (loads snd_bcm2835)
-dtparam=audio=on
+# Audio related. Note don't use dtparam=audio=on as it's for old not upstream audio
 audio_pwm_mode=2
 
 # Automatically load overlays for detected cameras
diff --git a/config.txt b/config.txt
index 6d9ce21..e86b476 100644
--- a/config.txt
+++ b/config.txt
@@ -58,8 +58,7 @@ gpu_mem=32
 # Use eXtended firmware by default
 start_x=1
 
-# Enable audio (loads snd_bcm2835)
-dtparam=audio=on
+# Audio related. Note don't use dtparam=audio=on as it's for old not upstream audio
 audio_pwm_mode=2
 
 # Automatically load overlays for detected cameras
diff --git a/sources b/sources
index eb65280..919ca37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bcm283x-firmware-f145afc.tar.xz) = 48036b1217edc244d8c9903641f88c1f9ad57d62a0f1f5b6aef8ad5727c623a6f14ba2958bc6d3695276a2b684374c7942ba7efaa42ee0adf14a61da0c628fe5
+SHA512 (bcm283x-firmware-c818048.tar.xz) = 9a0351d481b1f73d84c27e4aa76db797f11912e30032d82f5b4de98ed2e15e91ca14cedaec977e306ea4e342d355e5be6fa15eb91f1475645e088c37e63d5a2d