diff --git a/sonarqube.yaml b/sonarqube.yaml
index 8dd7b32dbdb..ae1a742d0c1 100644
--- a/sonarqube.yaml
+++ b/sonarqube.yaml
@@ -1,7 +1,7 @@
 package:
   name: sonarqube
-  version: "25.6.0.109173"
-  epoch: 1
+  version: "25.7.0.110598"
+  epoch: 0
   description: SonarQube is an open source platform for continuous inspection of code quality (Community Build)
   copyright:
     - license: LGPL-3.0-or-later
@@ -40,11 +40,11 @@ pipeline:
     with:
       repository: https://github.com/SonarSource/sonarqube
       tag: ${{package.version}}
-      expected-commit: 1000fd8a984575bcddc80653398655ed48f39fd3
+      expected-commit: 015eb1ed5885f7618f674dbf2321871de0f761fb
 
   - uses: patch
     with:
-      patches: sonar-eclipse-GHSA-vrpq-qp53-qv56.patch GHSA-hq9p-pm7w-8p54-remediation.patch
+      patches: GHSA-hq9p-pm7w-8p54-remediation.patch
 
   - name: build
     runs: |
diff --git a/sonarqube/GHSA-hq9p-pm7w-8p54-remediation.patch b/sonarqube/GHSA-hq9p-pm7w-8p54-remediation.patch
index 2432091607a..701173cd174 100644
--- a/sonarqube/GHSA-hq9p-pm7w-8p54-remediation.patch
+++ b/sonarqube/GHSA-hq9p-pm7w-8p54-remediation.patch
@@ -4,7 +4,7 @@
          entry 'log4j-over-slf4j'
          entry 'slf4j-api'
        }
--      dependency 'org.postgresql:postgresql:42.7.5'
+-      dependency 'org.postgresql:postgresql:42.7.6'
 +      dependency 'org.postgresql:postgresql:42.7.7'
        dependency 'org.reflections:reflections:0.10.2'
        dependency 'org.simpleframework:simple:5.1.6'
diff --git a/sonarqube/sonar-eclipse-GHSA-vrpq-qp53-qv56.patch b/sonarqube/sonar-eclipse-GHSA-vrpq-qp53-qv56.patch
deleted file mode 100644
index a2d2c4a4e8f..00000000000
--- a/sonarqube/sonar-eclipse-GHSA-vrpq-qp53-qv56.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c16f0449afb93177b54f31fdf8407a591a1c624b Mon Sep 17 00:00:00 2001
-From: Alain Kermis <alain.kermis@sonarsource.com>
-Date: Mon, 24 Mar 2025 16:15:09 +0100
-Subject: [PATCH] SONAR-24448 Upgrade org.eclipse.jgit:org.eclipse.jgit to
- 7.2.0.202503040940-r
-
----
- build.gradle | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build.gradle b/build.gradle
-index 29436b2b76f..bb1442b2e2a 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -469,7 +469,7 @@ subprojects {
-       }
-       dependency "org.elasticsearch.plugin:transport-netty4-client:${elasticSearchClientVersion}"
-       dependency 'org.elasticsearch:mocksocket:1.2'
--      dependency 'org.eclipse.jgit:org.eclipse.jgit:7.2.0.202503040940-r'
-+      dependency 'org.eclipse.jgit:org.eclipse.jgit:7.2.1.202505142326-r'
-       dependency "org.codelibs.elasticsearch.module:analysis-common:7.17.22"
-       dependency "org.codelibs.elasticsearch.module:reindex:7.17.22"
-       dependency 'org.tmatesoft.svnkit:svnkit:1.10.11') {