diff --git a/services/ort-run/src/main/kotlin/OrtServerMappings.kt b/services/ort-run/src/main/kotlin/OrtServerMappings.kt
index 69d106c542..4b10ad9a4c 100644
--- a/services/ort-run/src/main/kotlin/OrtServerMappings.kt
+++ b/services/ort-run/src/main/kotlin/OrtServerMappings.kt
@@ -104,7 +104,6 @@ import org.eclipse.apoapsis.ortserver.model.runs.scanner.SnippetFinding
 import org.eclipse.apoapsis.ortserver.model.runs.scanner.TextLocation
 import org.eclipse.apoapsis.ortserver.model.runs.scanner.UnknownProvenance
 
-import org.ossreviewtoolkit.model.AdvisorCapability as OrtAdvisorCapability
 import org.ossreviewtoolkit.model.AdvisorDetails as OrtAdvisorDetails
 import org.ossreviewtoolkit.model.AdvisorResult as OrtAdvisorResult
 import org.ossreviewtoolkit.model.AdvisorRun as OrtAdvisorRun
@@ -206,16 +205,12 @@ fun AdvisorConfiguration.mapToOrt() =
 
 fun AdvisorResult.mapToOrt() =
     OrtAdvisorResult(
-        advisor = OrtAdvisorDetails(
-            name = advisorName,
-            capabilities = enumSetOf(OrtAdvisorCapability.VULNERABILITIES)
-        ),
+        advisor = OrtAdvisorDetails(name = advisorName),
         summary = OrtAdvisorSummary(
             startTime = startTime.toJavaInstant(),
             endTime = endTime.toJavaInstant(),
             issues = issues.map(Issue::mapToOrt)
         ),
-        defects = emptyList(),
         vulnerabilities = vulnerabilities.map(Vulnerability::mapToOrt)
     )
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1a0bdaf826..cef86f7331 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -150,7 +150,7 @@ dependencyResolutionManagement {
         }
 
         create("ortLibs") {
-            from("org.ossreviewtoolkit:version-catalog:83.1.0")
+            from("org.ossreviewtoolkit:version-catalog:84.0.0")
         }
     }
 }
diff --git a/shared/ort-test-data/src/main/kotlin/OrtTestData.kt b/shared/ort-test-data/src/main/kotlin/OrtTestData.kt
index d43b418db4..b4b5071ee3 100644
--- a/shared/ort-test-data/src/main/kotlin/OrtTestData.kt
+++ b/shared/ort-test-data/src/main/kotlin/OrtTestData.kt
@@ -25,7 +25,6 @@ import java.net.URI
 import kotlin.time.Instant
 import kotlin.time.toJavaInstant
 
-import org.ossreviewtoolkit.model.AdvisorCapability
 import org.ossreviewtoolkit.model.AdvisorDetails
 import org.ossreviewtoolkit.model.AdvisorResult
 import org.ossreviewtoolkit.model.AdvisorRun
@@ -449,16 +448,12 @@ object OrtTestData {
     val advisorResults = sortedMapOf(
         pkgIdentifier to listOf(
             AdvisorResult(
-                advisor = AdvisorDetails(
-                    name = "VulnerableCode",
-                    capabilities = enumSetOf(AdvisorCapability.VULNERABILITIES)
-                ),
+                advisor = AdvisorDetails(name = "VulnerableCode"),
                 summary = AdvisorSummary(
                     startTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
                     endTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
                     issues = listOf(issue)
                 ),
-                defects = emptyList(),
                 vulnerabilities = listOf(vulnerability)
             )
         )
diff --git a/workers/advisor/src/test/kotlin/AdvisorWorkerTest.kt b/workers/advisor/src/test/kotlin/AdvisorWorkerTest.kt
index 548b5f8659..a15a5c451f 100644
--- a/workers/advisor/src/test/kotlin/AdvisorWorkerTest.kt
+++ b/workers/advisor/src/test/kotlin/AdvisorWorkerTest.kt
@@ -64,7 +64,6 @@ import org.eclipse.apoapsis.ortserver.workers.common.RunResult
 import org.eclipse.apoapsis.ortserver.workers.common.context.WorkerContext
 import org.eclipse.apoapsis.ortserver.workers.common.context.WorkerContextFactory
 
-import org.ossreviewtoolkit.model.AdvisorCapability
 import org.ossreviewtoolkit.model.AdvisorDetails
 import org.ossreviewtoolkit.model.AdvisorResult
 import org.ossreviewtoolkit.model.AdvisorRun
@@ -81,7 +80,6 @@ import org.ossreviewtoolkit.model.config.VulnerabilityResolution
 import org.ossreviewtoolkit.model.config.VulnerabilityResolutionReason
 import org.ossreviewtoolkit.model.vulnerabilities.Vulnerability
 import org.ossreviewtoolkit.model.vulnerabilities.VulnerabilityReference
-import org.ossreviewtoolkit.utils.common.enumSetOf
 
 private const val ORT_SERVER_MAPPINGS_FILE = "org.eclipse.apoapsis.ortserver.services.ortrun.OrtServerMappingsKt"
 
@@ -354,16 +352,12 @@ class AdvisorWorkerTest : StringSpec({
                 results = sortedMapOf(
                     Identifier("Maven:com.example:package:1.0") to listOf(
                         AdvisorResult(
-                            advisor = AdvisorDetails(
-                                name = "VulnerableCode",
-                                capabilities = enumSetOf(AdvisorCapability.VULNERABILITIES)
-                            ),
+                            advisor = AdvisorDetails(name = "VulnerableCode"),
                             summary = AdvisorSummary(
                                 startTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
                                 endTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
                                 issues = listOf(advisorIssue)
                             ),
-                            defects = emptyList(),
                             vulnerabilities = listOf(advisorVulnerability)
                         )
                     )
@@ -459,16 +453,12 @@ class AdvisorWorkerTest : StringSpec({
                 results = sortedMapOf(
                     Identifier("Maven:com.example:package:1.0") to listOf(
                         AdvisorResult(
-                            advisor = AdvisorDetails(
-                                name = "VulnerableCode",
-                                capabilities = enumSetOf(AdvisorCapability.VULNERABILITIES)
-                            ),
+                            advisor = AdvisorDetails(name = "VulnerableCode"),
                             summary = AdvisorSummary(
                                 startTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
                                 endTime = Instant.fromEpochSeconds(TIME_STAMP_SECONDS).toJavaInstant(),
                                 issues = emptyList()
                             ),
-                            defects = emptyList(),
                             vulnerabilities = listOf(advisorVulnerability)
                         )
                     )