diff --git a/media/video/pipewire/pipewire-launcher.sh b/media/video/pipewire/pipewire-launcher.sh
index 16a8adb8..59cacacf 100644
--- a/media/video/pipewire/pipewire-launcher.sh
+++ b/media/video/pipewire/pipewire-launcher.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+export PIPEWIRE_RUNTIME_DIR=$HOME/.config/pipewire
+export XDG_RUNTIME_DIR=$HOME/.config
+
 # We need to kill any existing pipewire instance to restore sound
 pkill -u "${USER}" -fx /usr/bin/pipewire-pulse 1>/dev/null 2>&1
 pkill -u "${USER}" -fx /usr/bin/pipewire-media-session 1>/dev/null 2>&1
@@ -19,4 +22,6 @@ elif [ -x /usr/bin/pipewire-media-session ]; then
 	exec /usr/bin/pipewire-media-session &
 fi
 
-[ -f "/usr/share/pipewire/pipewire-pulse.conf" ] && exec /usr/bin/pipewire-pulse &
+if [ -f "/usr/share/pipewire/pipewire-pulse.conf" ] ; then
+    exec /usr/bin/pipewire-pulse &
+fi
diff --git a/media/video/pipewire/pipewire.env b/media/video/pipewire/pipewire.env
new file mode 100644
index 00000000..c5c25fde
--- /dev/null
+++ b/media/video/pipewire/pipewire.env
@@ -0,0 +1,3 @@
+#!/bin/sh
+export PULSE_SERVER=unix:$HOME/.config/pulse/native
+export PIPEWIRE_RUNTIME_DIR=$HOME/.config/pipewire
\ No newline at end of file
diff --git a/media/video/pipewire/pipewire.initd b/media/video/pipewire/pipewire.initd
deleted file mode 100644
index ce8afd4d..00000000
--- a/media/video/pipewire/pipewire.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-
-name="pipewire"
-description="PipeWire multimedia server"
-pidfile="/run/${name}.pid"
-command="/usr/libexec/pipewire-launcher"
-command_background=true
-supervisor=supervise-daemon
-command_user="pipewire:audio"
-
-
-user="audio"
-group="audio"
-
-depend() {
-    need dbus
-}
-
-start_pre() {
-    checkpath --directory --mode 0755 --owner=pipewire:audio /run/${name}
-}
-
diff --git a/media/video/pipewire/ympbuild b/media/video/pipewire/ympbuild
index 73e7cf7c..01caa7c9 100644
--- a/media/video/pipewire/ympbuild
+++ b/media/video/pipewire/ympbuild
@@ -8,11 +8,13 @@ email='bayramk@gmail.com'
 maintainer='bk'
 license=('GPLv3')
 source=("https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$version/pipewire-$version.tar.gz"
+        "pipewire.env"
         "pipewire.desktop"
         "pipewire-launcher.sh")
 depends=(lilv libpulse alsa-lib dbus)
 makedepends=()
 sha256sums=('b88b9c94548128f0078dc6d376389c2447c6c324ee6dda20d9037bc77a9dd4ee'
+         'SKIP'
          'SKIP'
          'SKIP')
 group=(media.video)
@@ -45,9 +47,10 @@ build(){
 
 package(){
     ninja -C build install
-    mkdir -p ${DESTDIR}/usr/libexec ${DESTDIR}/etc/xdg/autostart/
+    mkdir -p ${DESTDIR}/usr/libexec ${DESTDIR}/etc/xdg/autostart/ ${DESTDIR}/etc/profile.d
     # pipewire launcher from alpine linux
     install ../pipewire-launcher.sh ${DESTDIR}/usr/libexec/pipewire-launcher
+    install ../pipewire.env ${DESTDIR}/etc/profile.d/pipewire.sh
     install ../pipewire.desktop ${DESTDIR}/etc/xdg/autostart/
 }