diff --git a/.github/workflows/release-nearby-qml-tray.yaml b/.github/workflows/release-nearby-qml-tray.yaml
index ed695792..4672e53a 100644
--- a/.github/workflows/release-nearby-qml-tray.yaml
+++ b/.github/workflows/release-nearby-qml-tray.yaml
@@ -24,14 +24,14 @@ jobs:
           submodules: recursive
 
       - name: Set up Bazelisk
-        uses: bazelbuild/setup-bazelisk@v3
-
-      - name: Cache Bazel build outputs
-        uses: actions/cache@v4
+        uses: bazel-contrib/setup-bazel@0.18.0
         with:
-          path: ~/.cache/bazel-disk
-          key: bazel-build-${{ runner.os }}-${{ github.sha }}
-          restore-keys: bazel-build-${{ runner.os }}-
+          # Avoid downloading Bazel every time.
+          bazelisk-cache: true
+          # Store build cache per workflow.
+          disk-cache: ${{ github.workflow }}
+          # Share repository cache between workflows.
+          repository-cache: true
 
       - name: Install Linux build dependencies
         run: |
@@ -63,7 +63,6 @@ jobs:
         run: |
           INSTALL_PREFIX="$RUNNER_TEMP/nearby-install"
           bazel build \
-            --disk_cache=~/.cache/bazel-disk \
             --check_visibility=false \
             --spawn_strategy=standalone \
             --verbose_failures \
diff --git a/sharing/linux/qml_tray_app/CMakeLists.txt b/sharing/linux/qml_tray_app/CMakeLists.txt
index 518fbf44..c5a497d3 100644
--- a/sharing/linux/qml_tray_app/CMakeLists.txt
+++ b/sharing/linux/qml_tray_app/CMakeLists.txt
@@ -87,7 +87,7 @@ install(FILES "${NEARBY_CONNECTIONS_SHARED_LIB}"
 
 qt_generate_deploy_qml_app_script(
   TARGET nearby_qml_file_tray_app
-  OUTPUT_SCRIPT nearby_qml_file_tray_app_deploy_script
+  FILENAME_VARIABLE nearby_qml_file_tray_app_deploy_script
 )
 install(SCRIPT "${nearby_qml_file_tray_app_deploy_script}")