diff --git a/metadata/threads.server.yml b/metadata/threads.server.yml
index a2b7aff076..a6d00d5690 100644
--- a/metadata/threads.server.yml
+++ b/metadata/threads.server.yml
@@ -936,7 +936,20 @@ Builds:
       - yes
     prebuild: echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> ../gradle.properties
 
+  - versionName: 3.5.8
+    versionCode: 358
+    commit: 8bf167d4c869ac0e64d63a8185ab0a2ffd727159
+    subdir: app
+    sudo:
+      - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
+      - apt-get update
+      - apt-get install -y -t trixie openjdk-21-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    prebuild: echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> ../gradle.properties
+
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-CurrentVersion: 3.5.7
-CurrentVersionCode: 357
+CurrentVersion: 3.5.8
+CurrentVersionCode: 358