diff --git a/.github/actions/setup-node.js/action.yml b/.github/actions/setup-node.js/action.yml
index 389604490ac..8e2c501c8b6 100644
--- a/.github/actions/setup-node.js/action.yml
+++ b/.github/actions/setup-node.js/action.yml
@@ -11,5 +11,5 @@ runs:
     - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
       with:
         node-version: ${{ env.JAEGER_UI_NODE_JS_VERSION }}
-        cache: 'yarn'
-        cache-dependency-path: jaeger-ui/yarn.lock
+        cache: 'npm'
+        cache-dependency-path: jaeger-ui/package-lock.json
diff --git a/.github/workflows/ci-docker-hotrod.yml b/.github/workflows/ci-docker-hotrod.yml
index 99641ff4947..ea171657ce7 100644
--- a/.github/workflows/ci-docker-hotrod.yml
+++ b/.github/workflows/ci-docker-hotrod.yml
@@ -35,6 +35,8 @@ jobs:
       with:
         go-version: 1.23.x
 
+    - uses: ./.github/actions/setup-node.js
+
     - uses: ./.github/actions/setup-branch
 
     - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ea54b85e259..33b78ea0baa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,7 +15,6 @@ We gratefully welcome improvements to documentation as well as to code.
 
 ### Pre-requisites
 * Install [Go](https://golang.org/doc/install) and setup GOPATH and add $GOPATH/bin in PATH
-* Install [Yarn](https://yarnpkg.com/) for running local build with the UI
 
 This library uses Go modules to manage dependencies.
 
diff --git a/jaeger-ui b/jaeger-ui
index 5c6b04bd4c2..6dbddd02cc4 160000
--- a/jaeger-ui
+++ b/jaeger-ui
@@ -1 +1 @@
-Subproject commit 5c6b04bd4c22818a43ba6f05cac79faa6af9aaa5
+Subproject commit 6dbddd02cc4ead13d3ab412aad90d5caa0a8907a
diff --git a/scripts/rebuild-ui.sh b/scripts/rebuild-ui.sh
index 9da911f3f4e..af2c301cb23 100755
--- a/scripts/rebuild-ui.sh
+++ b/scripts/rebuild-ui.sh
@@ -7,7 +7,7 @@ set -euxf -o pipefail
 
 cd jaeger-ui
 
-git fetch --all --tags
+git fetch --all --unshallow --tags
 git log --oneline --decorate=full -n 10 | cat
 
 last_tag=$(git describe --tags --dirty 2>/dev/null)
@@ -32,4 +32,4 @@ if [[ "$last_tag" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]];  then
 fi
 
 # do a regular full build
-yarn install --frozen-lockfile && cd packages/jaeger-ui && yarn build
+npm ci && cd packages/jaeger-ui && npm run build