diff --git a/calamares/modules/netinstall-ce-base.yaml b/calamares/modules/netinstall-ce-base.yaml
index 79112ad..b505a7a 100644
--- a/calamares/modules/netinstall-ce-base.yaml
+++ b/calamares/modules/netinstall-ce-base.yaml
@@ -126,6 +126,7 @@
           - alsa-firmware
           - alsa-plugins
           - alsa-utils
+          - apple-t2-audio-config
           - pavucontrol
           - pipewire-pulse
           - wireplumber
diff --git a/calamares/modules/netinstall.yaml b/calamares/modules/netinstall.yaml
index bce66cd..71178db 100644
--- a/calamares/modules/netinstall.yaml
+++ b/calamares/modules/netinstall.yaml
@@ -126,6 +126,7 @@
           - alsa-firmware
           - alsa-plugins
           - alsa-utils
+          - apple-t2-audio-config
           - pavucontrol
           - pipewire-pulse
           - wireplumber
diff --git a/calamares/modules/pacstrap.conf b/calamares/modules/pacstrap.conf
index ace3d71..b7463a5 100644
--- a/calamares/modules/pacstrap.conf
+++ b/calamares/modules/pacstrap.conf
@@ -12,7 +12,7 @@
 #
 basePackages:
   - iptables-nft
-  - apple-bcm-wifi-firmware
+  - apple-bcm-firmware
   - base
   - base-devel
   - btrfs-progs
diff --git a/calamares/scripts/chrooted_cleaner_script.sh b/calamares/scripts/chrooted_cleaner_script.sh
index 5bd6c91..36571cb 100644
--- a/calamares/scripts/chrooted_cleaner_script.sh
+++ b/calamares/scripts/chrooted_cleaner_script.sh
@@ -632,20 +632,6 @@ EOF
         _c_c_s_msg warning "GRUB config file not found"
     fi
     # install audio configs
-    model=$(< /sys/devices/virtual/dmi/id/product_name)
-    if [ "$model" = "MacBookPro16,1" ] ; then
-	_c_c_s_msg info "installing audio configs for MacBookPro16,1"
-	pacman -U /opt/extra-drivers/apple-t2-audio-config-alt-0.1-5-any.pkg.tar.zst --noconfirm
-    elif [ "$model" = "MacBookPro16,4" ] ; then
-	_c_c_s_msg info "installing audio configs for MacBookPro16,4"
-	pacman -U /opt/extra-drivers/apple-t2-audio-config-alt-0.1-5-any.pkg.tar.zst --noconfirm
-    elif [ "$model" = "MacBookAir9,1" ] ; then
-	_c_c_s_msg info "installing audio configs for MacBookAir9,1"
-	_copy_mba91_soundconfig
-    else
-	_c_c_s_msg info "installing generic audio configs"
-	pacman -U /opt/extra-drivers/apple-t2-audio-config-0.1-5-any.pkg.tar.zst --noconfirm
-    fi
 
     _check_install_mode
     _endeavouros