diff --git a/salt/browser/install-common.sls b/salt/browser/install-common.sls
index ad8ee75..67a6496 100644
--- a/salt/browser/install-common.sls
+++ b/salt/browser/install-common.sls
@@ -25,6 +25,6 @@ include:
       - thunar
       - zenity
       - libgdk-pixbuf2.0-bin
-      - pulseaudio-qubes
+      - pipewire-qubes
 
 {% endif -%}
diff --git a/salt/media/install.sls b/salt/media/install.sls
index 6db6d41..21c4a3b 100644
--- a/salt/media/install.sls
+++ b/salt/media/install.sls
@@ -21,7 +21,7 @@ include:
     - skip_suggestions: True
     - pkgs:
       - qubes-app-shutdown-idle
-      - pulseaudio-qubes
+      - pipewire-qubes
       - audacious
       - calibre
       - ffmpeg
diff --git a/salt/signal/install.sls b/salt/signal/install.sls
index 636127e..066c50e 100644
--- a/salt/signal/install.sls
+++ b/salt/signal/install.sls
@@ -26,7 +26,7 @@ include:
       - ca-certificates
       - qubes-core-agent-thunar
       - thunar
-      - pulseaudio-qubes
+      - pipewire-qubes
       - signal-desktop
       - zenity
       - dunst
diff --git a/salt/sys-pgp/install.sls b/salt/sys-pgp/install.sls
index db67206..8036e17 100644
--- a/salt/sys-pgp/install.sls
+++ b/salt/sys-pgp/install.sls
@@ -20,7 +20,6 @@ include:
     - skip_suggestions: True
     - pkgs:
       - split-gpg2
-      - qubes-gpg-split
       - gnupg2
 
 {% set pkg = {
diff --git a/salt/sys-usb/install-client-fido.sls b/salt/sys-usb/install-client-fido.sls
index 123888a..24d44e8 100644
--- a/salt/sys-usb/install-client-fido.sls
+++ b/salt/sys-usb/install-client-fido.sls
@@ -19,7 +19,6 @@ include:
     - install_recommends: False
     - skip_suggestions: True
     - pkgs:
-      - qubes-u2f
-      #- qubes-ctap
+      - qubes-ctap
 
 {% endif -%}
diff --git a/salt/sys-usb/install.sls b/salt/sys-usb/install.sls
index 789f0d0..408ca0f 100644
--- a/salt/sys-usb/install.sls
+++ b/salt/sys-usb/install.sls
@@ -19,7 +19,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
       - pciutils
       - qubes-input-proxy-sender
       - qubes-usb-proxy
-      - qubes-u2f
-      #- qubes-ctap
+      - qubes-ctap
 
 {% endif -%}