diff --git a/containerfiles/runner-builder.Containerfile b/containerfiles/runner-builder.Containerfile
index 9b1a799e..1a074c43 100644
--- a/containerfiles/runner-builder.Containerfile
+++ b/containerfiles/runner-builder.Containerfile
@@ -28,7 +28,7 @@ RUN rustup default stable
 
 # Install cargo-chef with proper caching
 RUN --mount=type=cache,target=${CARGO_HOME}/registry \
-    cargo install -j $(nproc) cargo-chef --locked
+    cargo install cargo-chef --locked
 
 #*******************************#
 # vimputti manager build stages #
@@ -130,7 +130,7 @@ RUN --mount=type=cache,target=${CARGO_HOME}/registry \
     cargo install cargo-c
 
 # Clone repository
-RUN git clone --depth 1 --rev "dadf6bf3a3a49cc07a0e3d644f48233e29449db4" https://github.com/games-on-whales/gst-wayland-display.git
+RUN git clone --depth 1 --rev "e4c70b64dad3cd8bbf5eec011f419386adf737ee" https://github.com/games-on-whales/gst-wayland-display.git
 
 #--------------------------------------------------------------------
 FROM gst-wayland-deps AS gst-wayland-planner
@@ -148,7 +148,7 @@ COPY --from=gst-wayland-planner /builder/gst-wayland-display/recipe.json .
 
 # Cache dependencies using cargo-chef
 RUN --mount=type=cache,target=${CARGO_HOME}/registry \
-    cargo chef cook --release --recipe-path recipe.json
+    cargo chef cook --release --recipe-path recipe.json --features cuda
 
 
 ENV CARGO_TARGET_DIR=/builder/target
@@ -158,7 +158,7 @@ COPY --from=gst-wayland-planner /builder/gst-wayland-display/ .
 # Build and install directly to artifacts
 RUN --mount=type=cache,target=${CARGO_HOME}/registry \
     --mount=type=cache,target=/builder/target \
-    cargo cinstall --prefix=${ARTIFACTS} --release
+    cargo cinstall --prefix=${ARTIFACTS} --release --features cuda
 
 #*********************************#
 # Patched bubblewrap build stages #
diff --git a/packages/scripts/entrypoint_nestri.sh b/packages/scripts/entrypoint_nestri.sh
index c55d4eff..6a0d3b06 100644
--- a/packages/scripts/entrypoint_nestri.sh
+++ b/packages/scripts/entrypoint_nestri.sh
@@ -108,7 +108,7 @@ start_compositor() {
 
     # Set default compositor if unset
     if [[ -z "${NESTRI_LAUNCH_COMPOSITOR+x}" ]]; then
-        NESTRI_LAUNCH_COMPOSITOR="gamescope --backend wayland --force-grab-cursor -g -f --rt --mangoapp -W ${WIDTH} -H ${HEIGHT} -r ${FRAMERATE:-60}"
+        NESTRI_LAUNCH_COMPOSITOR="gamescope --backend wayland --force-grab-cursor -g -f --rt -W ${WIDTH} -H ${HEIGHT} -r ${FRAMERATE:-60}"
     fi
 
     # If PRELOAD_SHIM_arch's are set and exist, set LD_PRELOAD for 32/64-bit apps
@@ -120,7 +120,7 @@ start_compositor() {
 
     # Configure launch cmd with dbus if set
     local launch_cmd=""
-    if [[ -n "${NESTRI_LAUNCH_CMD}" ]]; then
+    if [[ -n "${NESTRI_LAUNCH_CMD+x}" ]]; then
         if $do_ld_preload; then
             launch_cmd="LD_PRELOAD='/usr/\$LIB/libvimputti_shim.so' dbus-launch $NESTRI_LAUNCH_CMD"
         else
@@ -137,9 +137,9 @@ start_compositor() {
         if [[ "$compositor_cmd" == *"gamescope"* ]]; then
             is_gamescope=true
             if [[ -n "$launch_cmd" ]] && [[ "$compositor_cmd" != *" -- "* ]]; then
-                # If steam in launch command, enable gamescope integration via -e
+                # If steam in launch command, enable gamescope integration via -e and enable mangohud
                 if [[ "$launch_cmd" == *"steam"* ]]; then
-                    compositor_cmd+=" -e"
+                    compositor_cmd+=" --mangoapp -e"
                 fi
                 compositor_cmd+=" -- bash -c $(printf %q "$launch_cmd")"
             fi
diff --git a/packages/scripts/envs.sh b/packages/scripts/envs.sh
index be6da561..0da74354 100644
--- a/packages/scripts/envs.sh
+++ b/packages/scripts/envs.sh
@@ -4,8 +4,6 @@ export USER=${NESTRI_USER}
 export LANG=${NESTRI_LANG}
 export HOME=${NESTRI_HOME}
 export XDG_RUNTIME_DIR=${NESTRI_XDG_RUNTIME_DIR}
-export XDG_SESSION_TYPE=x11
-export DISPLAY=:0
 
 # Causes some setups to break
 export PROTON_NO_FSYNC=1