diff --git a/etc/soundsystem/pipewire b/etc/soundsystem/pipewire
index a5bcbdd..144528c 100644
--- a/etc/soundsystem/pipewire
+++ b/etc/soundsystem/pipewire
@@ -4,11 +4,12 @@ packages() {
 
 config() {
 	enable_service
-	vmkdir etc/xdg/autostart
 
+	vmkdir etc/xdg/autostart
 	vinstall "${FILESDIR}/xdg/autostart/pipewire.desktop" 755 etc/xdg/autostart
-	vinstall "${FILESDIR}/xdg/autostart/pipewire-media-session.desktop" 755 etc/xdg/autostart
-	vinstall "${FILESDIR}/xdg/autostart/pipewire-pulse.desktop" 755 etc/xdg/autostart
+	
+	vmkdir etc/pipewire/pipewire.conf.d
+	vinstall "${FILESDIR}/files/pipewire/start-pipewire-pulse.conf" 755 etc/pipewire/pipewire.conf.d
 
 	echo "/usr/lib/pipewire-0.3/jack" > /etc/ld.so.conf.d/zpipewire-jack.conf
 	#ldconfig
diff --git a/files/pipewire/start-pipewire-pulse.conf b/files/pipewire/start-pipewire-pulse.conf
new file mode 100644
index 0000000..c0007aa
--- /dev/null
+++ b/files/pipewire/start-pipewire-pulse.conf
@@ -0,0 +1,8 @@
+context.exec = [
+    # You can optionally start the pulseaudio-server here as well
+    # but it is better to start it as a systemd service.
+    # It can be interesting to start another daemon here that listens
+    # on another address with the -a option (eg. -a tcp:4713).
+    #
+    { path = "/usr/bin/pipewire-pulse" args = "" }
+]
diff --git a/files/xdg/autostart/pipewire-pulse.desktop b/files/xdg/autostart/pipewire-pulse.desktop
deleted file mode 100644
index c5e2bad..0000000
--- a/files/xdg/autostart/pipewire-pulse.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=PipeWire Pulse
-Comment=Start the PipeWire Pulse
-Exec=/sbin/dbus-launch --exit-with-session /usr/bin/pipewire-pulse
-Terminal=false
-Type=Application
-X-GNOME-Autostart-Phase=Initialization
-X-KDE-autostart-phase=1
\ No newline at end of file
diff --git a/files/xdg/autostart/pipewire-session.desktop b/files/xdg/autostart/pipewire-session.desktop
deleted file mode 100644
index 6f19fb8..0000000
--- a/files/xdg/autostart/pipewire-session.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=PipeWire Media Session
-Comment=Start the PipeWire Media Session
-Exec=/sbin/dbus-launch --exit-with-session /usr/bin/pipewire-media-session
-Terminal=false
-Type=Application
-X-GNOME-Autostart-Phase=Initialization
-X-KDE-autostart-phase=1
\ No newline at end of file