diff --git a/files/scripts/installbitwig.sh b/files/scripts/installbitwig.sh
index 14a9ea6..84d50dc 100644
--- a/files/scripts/installbitwig.sh
+++ b/files/scripts/installbitwig.sh
@@ -7,11 +7,27 @@ dnf install -y libbsd bzip2-libs dpkg
 
 curl -L -o /tmp/bitwig.deb "https://www.bitwig.com/dl/?id=419&os=installer_linux"
 
-dpkg-deb -x /tmp/bitwig.deb /
+# Extract to temp dir to avoid /opt -> /var/opt symlink issues on immutable OS
+mkdir -p /tmp/bitwig-extract
+dpkg-deb -x /tmp/bitwig.deb /tmp/bitwig-extract
+
+# Install main app to /usr/lib instead of /opt (which resolves to /var/opt at runtime)
+mv /tmp/bitwig-extract/opt/bitwig-studio /usr/lib/bitwig-studio
+
+# Copy remaining files (desktop entry, icons, mime types, etc.)
+cp -rT /tmp/bitwig-extract/usr /usr
+
+# Fix symlink to point to the new location
+ln -sf /usr/lib/bitwig-studio/bitwig-studio /usr/bin/bitwig-studio
+
+# Fix paths in .desktop file
+if [ -f /usr/share/applications/com.bitwig.BitwigStudio.desktop ]; then
+  sed -i 's|/opt/bitwig-studio|/usr/lib/bitwig-studio|g' /usr/share/applications/com.bitwig.BitwigStudio.desktop
+fi
 
 ln -sf /usr/lib64/libbz2.so.1 /usr/lib64/libbz2.so.1.0
 
-rm -f /tmp/bitwig.deb
+rm -rf /tmp/bitwig-extract /tmp/bitwig.deb
 
 echo "Bitwig Studio installation complete."
 
diff --git a/files/scripts/installrenoise.sh b/files/scripts/installrenoise.sh
index 9d82867..744176a 100644
--- a/files/scripts/installrenoise.sh
+++ b/files/scripts/installrenoise.sh
@@ -1,12 +1,44 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+RENOISE_VERSION=3.5.4
+EXTRACT_DIR=/tmp/Renoise_3_5_4_Demo_Linux_x86_64
+
 curl -L -o /tmp/renoise.tar.gz "https://files.renoise.com/demo/Renoise_3_5_4_Demo_Linux_x86_64.tar.gz"
-tar xvf /tmp/renoise.tar.gz -C /tmp
+tar xf /tmp/renoise.tar.gz -C /tmp
 
-cd /tmp/Renoise_3_5_4_Demo_Linux_x86_64
-./install.sh || echo "Installer finished with minor warnings (likely desktop-integration related)"
+# Skip install.sh — it targets /usr/local which symlinks to /var/usrlocal on immutable OS
+# and is not included in the deployed ostree image.
+# Instead, install directly into /usr paths.
 
-rm -rf /tmp/renoise.tar.gz /tmp/Renoise* || true
+# Keep binary and Resources/ together so Renoise can find its resources via relative path
+mkdir -p /usr/lib/renoise
+cp -r "${EXTRACT_DIR}/Resources" /usr/lib/renoise/
+install -m755 "${EXTRACT_DIR}/renoise" /usr/lib/renoise/renoise
+
+# Wrapper script so 'renoise' is in PATH and the binary runs from its own directory
+cat > /usr/bin/renoise << 'EOF'
+#!/bin/bash
+exec /usr/lib/renoise/renoise "$@"
+EOF
+chmod 755 /usr/bin/renoise
+
+# Desktop entry, icons, MIME types, man pages
+install -D -m644 "${EXTRACT_DIR}/Installer/renoise.desktop" \
+  /usr/share/applications/renoise.desktop
+install -D -m644 "${EXTRACT_DIR}/Installer/renoise-48.png" \
+  /usr/share/icons/hicolor/48x48/apps/renoise.png
+install -D -m644 "${EXTRACT_DIR}/Installer/renoise-64.png" \
+  /usr/share/icons/hicolor/64x64/apps/renoise.png
+install -D -m644 "${EXTRACT_DIR}/Installer/renoise-128.png" \
+  /usr/share/icons/hicolor/128x128/apps/renoise.png
+install -D -m644 "${EXTRACT_DIR}/Installer/renoise.xml" \
+  /usr/share/mime/packages/renoise.xml
+install -D -m644 "${EXTRACT_DIR}/Installer/renoise.1.gz" \
+  /usr/share/man/man1/renoise.1.gz
+install -D -m644 "${EXTRACT_DIR}/Installer/renoise-pattern-effects.5.gz" \
+  /usr/share/man/man5/renoise-pattern-effects.5.gz
+
+rm -rf /tmp/renoise.tar.gz "${EXTRACT_DIR}"
 
 exit 0