diff --git a/.gitpod/Dockerfile b/.gitpod/Dockerfile
index 58d3fa8a87..4ca4ede5f2 100644
--- a/.gitpod/Dockerfile
+++ b/.gitpod/Dockerfile
@@ -1,6 +1,10 @@
-FROM gitpod/workspace-full
-
+FROM gitpod/workspace-full:latest
+ARG JAVA_VERSION=21.0.6-tem
 ARG MAVEN_VERSION=3.9.9
-
-RUN brew install gh && \
-    bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && sdk install maven ${MAVEN_VERSION} && sdk default maven ${MAVEN_VERSION}"
+# Install Java 21, Maven and GitHub CLI
+RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && \
+    sdk install java ${JAVA_VERSION} && \
+    sdk default java ${JAVA_VERSION} && \
+    sdk install maven ${MAVEN_VERSION} && \
+    sdk default maven ${MAVEN_VERSION} && \
+    brew install gh"
diff --git a/core/src/main/java/jenkins/model/details/Detail.java b/core/src/main/java/jenkins/model/details/Detail.java
index a8e31e41f1..10df02f78f 100644
--- a/core/src/main/java/jenkins/model/details/Detail.java
+++ b/core/src/main/java/jenkins/model/details/Detail.java
@@ -15,7 +15,7 @@ import org.jenkins.ui.icon.IconSpec;
  *  <li>SCM information for the build</li>
  *  <li>who kicked the build off</li>
  * </ul>
- * @since TODO
+ * @since 2.498
  */
 public abstract class Detail implements ModelObject, IconSpec {
 
diff --git a/core/src/main/java/jenkins/model/details/DetailFactory.java b/core/src/main/java/jenkins/model/details/DetailFactory.java
index 2c1dd7ad57..edc030de5b 100644
--- a/core/src/main/java/jenkins/model/details/DetailFactory.java
+++ b/core/src/main/java/jenkins/model/details/DetailFactory.java
@@ -36,7 +36,7 @@ import org.kohsuke.accmod.restrictions.NoExternalUse;
 /**
  * Allows you to add multiple details to an Actionable object at once.
  * @param <T> the type of object to add to; typically an {@link Actionable} subtype
- * @since TODO
+ * @since 2.498
  */
 public abstract class DetailFactory<T extends Actionable> implements ExtensionPoint {
 
diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
index 6b158ddc4e..718ec2fe05 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
@@ -49,7 +49,10 @@ THE SOFTWARE.
                     clazz="${page.runs.isEmpty() and page.queueItems.isEmpty() ? 'jenkins-hidden' : ''}"/>
 
       <div class="app-builds-container">
-        <div id="no-builds" class="app-builds-container__placeholder">
+        <div id="loading-builds" class="app-builds-container__placeholder">
+          <l:spinner text="${%Loading builds...}"/>
+        </div>
+        <div id="no-builds" style="display:none" class="app-builds-container__placeholder">
           ${%No builds}
         </div>
 
diff --git a/package.json b/package.json
index 2be9360124..338d2330d1 100644
--- a/package.json
+++ b/package.json
@@ -34,10 +34,10 @@
     "eslint": "9.20.1",
     "eslint-config-prettier": "10.0.1",
     "eslint-formatter-checkstyle": "8.40.0",
-    "globals": "15.15.0",
+    "globals": "16.0.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.2",
-    "postcss": "8.5.2",
+    "postcss": "8.5.3",
     "postcss-loader": "8.1.1",
     "postcss-preset-env": "10.1.4",
     "postcss-scss": "4.0.9",
diff --git a/src/main/js/pages/project/builds-card.js b/src/main/js/pages/project/builds-card.js
index 44c57c05b5..8f8c5894ba 100644
--- a/src/main/js/pages/project/builds-card.js
+++ b/src/main/js/pages/project/builds-card.js
@@ -9,6 +9,7 @@ const ajaxUrl = buildHistoryPage.getAttribute("page-ajax");
 const card = document.querySelector("#jenkins-builds");
 const contents = card.querySelector("#jenkins-build-history");
 const container = card.querySelector(".app-builds-container");
+const loadingBuilds = card.querySelector("#loading-builds");
 const noBuilds = card.querySelector("#no-builds");
 
 // Pagination controls
@@ -58,6 +59,7 @@ function load(options = {}) {
         if (responseText.trim() === "") {
           contents.innerHTML = "";
           noBuilds.style.display = "block";
+          loadingBuilds.style.display = "none";
           updateCardControls({
             pageHasUp: false,
             pageHasDown: false,
@@ -69,7 +71,7 @@ function load(options = {}) {
 
         // Show the refreshed builds list
         contents.innerHTML = responseText;
-        noBuilds.style.display = "none";
+        loadingBuilds.style.display = "none";
         behaviorShim.applySubtree(contents);
 
         // Show the card controls
@@ -146,6 +148,7 @@ document.addEventListener("DOMContentLoaded", function () {
     debouncedLoad();
   });
 
+  container.classList.add("app-builds-container--loading");
   load();
 
   window.addEventListener("focus", function () {
diff --git a/src/main/scss/components/_tabs.scss b/src/main/scss/components/_tabs.scss
index b7ac90c237..793416d834 100644
--- a/src/main/scss/components/_tabs.scss
+++ b/src/main/scss/components/_tabs.scss
@@ -1,6 +1,6 @@
 @use "../abstracts/mixins";
 
-$border-radius: 100px;
+$border-radius: 19px;
 
 .tabBarFrame {
   position: relative;
@@ -36,7 +36,7 @@ $border-radius: 100px;
   display: flex;
   align-items: center;
   justify-content: center;
-  min-height: 36px;
+  min-height: 34px;
   padding: 0 1.2rem;
   border-radius: $border-radius;
   color: var(--tabs-item-foreground);
diff --git a/war/pom.xml b/war/pom.xml
index 4b8b7a6857..1723486c95 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -539,14 +539,14 @@ THE SOFTWARE.
                   <!-- dependency of jakarta-mail-api -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>jakarta-activation-api</artifactId>
-                  <version>2.1.3-1</version>
+                  <version>2.1.3-2</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>
                   <!-- dependency of mailer -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>jakarta-mail-api</artifactId>
-                  <version>2.1.3-1</version>
+                  <version>2.1.3-2</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>
diff --git a/yarn.lock b/yarn.lock
index 3d2e1da505..a4587edeec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3970,10 +3970,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:15.15.0":
-  version: 15.15.0
-  resolution: "globals@npm:15.15.0"
-  checksum: 10c0/f9ae80996392ca71316495a39bec88ac43ae3525a438b5626cd9d5ce9d5500d0a98a266409605f8cd7241c7acf57c354a48111ea02a767ba4f374b806d6861fe
+"globals@npm:16.0.0":
+  version: 16.0.0
+  resolution: "globals@npm:16.0.0"
+  checksum: 10c0/8906d5f01838df64a81d6c2a7b7214312e2216cf65c5ed1546dc9a7d0febddf55ffa906cf04efd5b01eec2534d6f14859a89535d1a68241832810e41ef3fd5bb
   languageName: node
   linkType: hard
 
@@ -4389,14 +4389,14 @@ __metadata:
     eslint: "npm:9.20.1"
     eslint-config-prettier: "npm:10.0.1"
     eslint-formatter-checkstyle: "npm:8.40.0"
-    globals: "npm:15.15.0"
+    globals: "npm:16.0.0"
     handlebars: "npm:4.7.8"
     handlebars-loader: "npm:1.7.3"
     hotkeys-js: "npm:3.12.2"
     jquery: "npm:3.7.1"
     lodash: "npm:4.17.21"
     mini-css-extract-plugin: "npm:2.9.2"
-    postcss: "npm:8.5.2"
+    postcss: "npm:8.5.3"
     postcss-loader: "npm:8.1.1"
     postcss-preset-env: "npm:10.1.4"
     postcss-scss: "npm:4.0.9"
@@ -6126,14 +6126,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:8.5.2, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.5.1":
-  version: 8.5.2
-  resolution: "postcss@npm:8.5.2"
+"postcss@npm:8.5.3, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.5.1":
+  version: 8.5.3
+  resolution: "postcss@npm:8.5.3"
   dependencies:
     nanoid: "npm:^3.3.8"
     picocolors: "npm:^1.1.1"
     source-map-js: "npm:^1.2.1"
-  checksum: 10c0/3044d49bc725029ab62292e8bf9849741251b95f3b754e191bf8b4025414d40ec3b4ac05c5a563d4b50060b5c8e96683eb4d783d8d8fa3867eb7b763cbe66127
+  checksum: 10c0/b75510d7b28c3ab728c8733dd01538314a18c52af426f199a3c9177e63eb08602a3938bfb66b62dc01350b9aed62087eabbf229af97a1659eb8d3513cec823b3
   languageName: node
   linkType: hard