diff --git a/build.gradle.kts b/build.gradle.kts
index 07e56dd12..d7e2f842e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,28 +17,17 @@ import org.eclipse.edc.plugins.edcbuild.plugins.MergeOpenApiSpecTask
 plugins {
     `java-library`
     alias(libs.plugins.edc.build)
+    alias(libs.plugins.autodoc) apply false
 }
 
-val edcScmConnection: String by project
-val edcScmUrl: String by project
-
-buildscript {
-    dependencies {
-        val version: String by project
-        classpath("org.eclipse.edc.autodoc:org.eclipse.edc.autodoc.gradle.plugin:$version")
-    }
-}
-
-val edcBuildId = libs.plugins.edc.build.get().pluginId
-
 allprojects {
-    apply(plugin = edcBuildId)
-    apply(plugin = "org.eclipse.edc.autodoc")
+    apply(plugin = rootProject.libs.plugins.edc.build.get().pluginId)
+    apply(plugin = rootProject.libs.plugins.autodoc.get().pluginId)
 
     configure<org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension> {
         pom {
-            scmConnection.set(edcScmConnection)
-            scmUrl.set(edcScmUrl)
+            scmConnection.set(rootProject.property("edcScmConnection") as String)
+            scmUrl.set(rootProject.property("edcScmUrl") as String)
         }
     }
 
diff --git a/core/identity-hub-keypairs-transit/src/main/java/org/eclipse/edc/identityhub/TransitJwsSignerProvider.java b/core/identity-hub-keypairs-transit/src/main/java/org/eclipse/edc/identityhub/TransitJwsSignerProvider.java
index dc605f852..1eb42afce 100644
--- a/core/identity-hub-keypairs-transit/src/main/java/org/eclipse/edc/identityhub/TransitJwsSignerProvider.java
+++ b/core/identity-hub-keypairs-transit/src/main/java/org/eclipse/edc/identityhub/TransitJwsSignerProvider.java
@@ -35,11 +35,6 @@ public TransitJwsSignerProvider(TransitEngine transitEngine) {
         this.transitEngine = transitEngine;
     }
 
-    @Override
-    public Result<JWSSigner> createJwsSigner(String privateKeyId) {
-        return createJwsSigner(null, privateKeyId);
-    }
-
     @Override
     public Result<JWSSigner> createJwsSigner(String participantContextId, String privateKeyName) {
         return Result.success(new TransitSigner(transitEngine, privateKeyName));
diff --git a/core/identity-hub-keypairs-transit/src/test/java/org/eclipse/edc/identityhub/TransitJwsSignerProviderTest.java b/core/identity-hub-keypairs-transit/src/test/java/org/eclipse/edc/identityhub/TransitJwsSignerProviderTest.java
index 1cb227f31..41bcee6ba 100644
--- a/core/identity-hub-keypairs-transit/src/test/java/org/eclipse/edc/identityhub/TransitJwsSignerProviderTest.java
+++ b/core/identity-hub-keypairs-transit/src/test/java/org/eclipse/edc/identityhub/TransitJwsSignerProviderTest.java
@@ -26,7 +26,6 @@ class TransitJwsSignerProviderTest {
 
     @Test
     void createJwsSigner() {
-        assertThat(provider.createJwsSigner("test-key")).isSucceeded().isInstanceOf(TransitSigner.class);
         assertThat(provider.createJwsSigner("test-participant", "test-key")).isSucceeded().isInstanceOf(TransitSigner.class);
     }
 }
\ No newline at end of file
diff --git a/core/issuerservice/issuerservice-issuance/src/test/java/org/eclipse/edc/issuerservice/issuance/generator/JoseVcdm20CredentialGeneratorTest.java b/core/issuerservice/issuerservice-issuance/src/test/java/org/eclipse/edc/issuerservice/issuance/generator/JoseVcdm20CredentialGeneratorTest.java
index a2526baac..5416c0c2b 100644
--- a/core/issuerservice/issuerservice-issuance/src/test/java/org/eclipse/edc/issuerservice/issuance/generator/JoseVcdm20CredentialGeneratorTest.java
+++ b/core/issuerservice/issuerservice-issuance/src/test/java/org/eclipse/edc/issuerservice/issuance/generator/JoseVcdm20CredentialGeneratorTest.java
@@ -73,8 +73,6 @@ void setup() throws JOSEException {
         var vpSigningKey = createKey(Curve.P_384, "vc-key");
         when(signerProvider.createJwsSigner(eq(TEST_PARTICIPANT), anyString())).thenReturn(Result.failure("not found"));
         when(signerProvider.createJwsSigner(eq(TEST_PARTICIPANT), eq(PRIVATE_KEY_ALIAS))).thenReturn(Result.success(new ECDSASigner(vpSigningKey)));
-
-        when(signerProvider.createJwsSigner(anyString())).thenThrow(new AssertionError("This method is deprecated and not to be used anymore"));
     }
 
     @Test
diff --git a/core/issuerservice/issuerservice-issuance/src/test/java/org/eclipse/edc/issuerservice/issuance/generator/JwtCredentialGeneratorTest.java b/core/issuerservice/issuerservice-issuance/src/test/java/org/eclipse/edc/issuerservice/issuance/generator/JwtCredentialGeneratorTest.java
index 67e661c94..3c76d1215 100644
--- a/core/issuerservice/issuerservice-issuance/src/test/java/org/eclipse/edc/issuerservice/issuance/generator/JwtCredentialGeneratorTest.java
+++ b/core/issuerservice/issuerservice-issuance/src/test/java/org/eclipse/edc/issuerservice/issuance/generator/JwtCredentialGeneratorTest.java
@@ -68,8 +68,6 @@ void setup() throws JOSEException {
         var vpSigningKey = createKey(Curve.P_384, "vc-key");
         when(signerProvider.createJwsSigner(eq(TEST_PARTICIPANT), anyString())).thenReturn(Result.failure("not found"));
         when(signerProvider.createJwsSigner(eq(TEST_PARTICIPANT), eq(PRIVATE_KEY_ALIAS))).thenReturn(Result.success(new ECDSASigner(vpSigningKey)));
-
-        when(signerProvider.createJwsSigner(anyString())).thenThrow(new AssertionError("This method is deprecated and not to be used anymore"));
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
diff --git a/extensions/api/identity-api/did-api/build.gradle.kts b/extensions/api/identity-api/did-api/build.gradle.kts
index 62297b5d4..449cfbf61 100644
--- a/extensions/api/identity-api/did-api/build.gradle.kts
+++ b/extensions/api/identity-api/did-api/build.gradle.kts
@@ -37,6 +37,6 @@ dependencies {
 
 edcBuild {
     swagger {
-        apiGroup.set("identity-api")
+        apiGroup("identity-api")
     }
 }
diff --git a/extensions/api/identity-api/keypair-api/build.gradle.kts b/extensions/api/identity-api/keypair-api/build.gradle.kts
index 328decf86..138a9a63c 100644
--- a/extensions/api/identity-api/keypair-api/build.gradle.kts
+++ b/extensions/api/identity-api/keypair-api/build.gradle.kts
@@ -21,6 +21,6 @@ dependencies {
 
 edcBuild {
     swagger {
-        apiGroup.set("identity-api")
+        apiGroup("identity-api")
     }
 }
\ No newline at end of file
diff --git a/extensions/api/identity-api/participant-context-api/build.gradle.kts b/extensions/api/identity-api/participant-context-api/build.gradle.kts
index e60f9766b..a56d09edd 100644
--- a/extensions/api/identity-api/participant-context-api/build.gradle.kts
+++ b/extensions/api/identity-api/participant-context-api/build.gradle.kts
@@ -38,6 +38,6 @@ dependencies {
 
 edcBuild {
     swagger {
-        apiGroup.set("identity-api")
+        apiGroup("identity-api")
     }
 }
diff --git a/extensions/api/identity-api/verifiable-credentials-api/build.gradle.kts b/extensions/api/identity-api/verifiable-credentials-api/build.gradle.kts
index 908cffab1..0425142f5 100644
--- a/extensions/api/identity-api/verifiable-credentials-api/build.gradle.kts
+++ b/extensions/api/identity-api/verifiable-credentials-api/build.gradle.kts
@@ -20,6 +20,6 @@ dependencies {
 
 edcBuild {
     swagger {
-        apiGroup.set("identity-api")
+        apiGroup("identity-api")
     }
 }
\ No newline at end of file
diff --git a/extensions/api/issuer-admin-api/attestation-api/build.gradle.kts b/extensions/api/issuer-admin-api/attestation-api/build.gradle.kts
index 8a3341964..0b5f121c7 100644
--- a/extensions/api/issuer-admin-api/attestation-api/build.gradle.kts
+++ b/extensions/api/issuer-admin-api/attestation-api/build.gradle.kts
@@ -35,6 +35,6 @@ dependencies {
 
 edcBuild {
     swagger {
-        apiGroup.set("issuer-admin-api")
+        apiGroup("issuer-admin-api")
     }
 }
diff --git a/extensions/api/issuer-admin-api/credential-definition-api/build.gradle.kts b/extensions/api/issuer-admin-api/credential-definition-api/build.gradle.kts
index 04cbe6a0e..b7d0bb330 100644
--- a/extensions/api/issuer-admin-api/credential-definition-api/build.gradle.kts
+++ b/extensions/api/issuer-admin-api/credential-definition-api/build.gradle.kts
@@ -34,6 +34,6 @@ dependencies {
 
 edcBuild {
     swagger {
-        apiGroup.set("issuer-admin-api")
+        apiGroup("issuer-admin-api")
     }
 }
diff --git a/extensions/api/issuer-admin-api/credentials-api/build.gradle.kts b/extensions/api/issuer-admin-api/credentials-api/build.gradle.kts
index 0237107d4..99d605332 100644
--- a/extensions/api/issuer-admin-api/credentials-api/build.gradle.kts
+++ b/extensions/api/issuer-admin-api/credentials-api/build.gradle.kts
@@ -35,6 +35,6 @@ dependencies {
 
 edcBuild {
     swagger {
-        apiGroup.set("issuer-admin-api")
+        apiGroup("issuer-admin-api")
     }
 }
diff --git a/extensions/api/issuer-admin-api/holder-api/build.gradle.kts b/extensions/api/issuer-admin-api/holder-api/build.gradle.kts
index 09d0fdd4e..26bbe7729 100644
--- a/extensions/api/issuer-admin-api/holder-api/build.gradle.kts
+++ b/extensions/api/issuer-admin-api/holder-api/build.gradle.kts
@@ -34,6 +34,6 @@ dependencies {
 
 edcBuild {
     swagger {
-        apiGroup.set("issuer-admin-api")
+        apiGroup("issuer-admin-api")
     }
 }
diff --git a/extensions/api/issuer-admin-api/issuance-process-api/build.gradle.kts b/extensions/api/issuer-admin-api/issuance-process-api/build.gradle.kts
index 9e6260d51..3e8e46a92 100644
--- a/extensions/api/issuer-admin-api/issuance-process-api/build.gradle.kts
+++ b/extensions/api/issuer-admin-api/issuance-process-api/build.gradle.kts
@@ -33,6 +33,6 @@ dependencies {
 
 edcBuild {
     swagger {
-        apiGroup.set("issuer-admin-api")
+        apiGroup("issuer-admin-api")
     }
 }
diff --git a/extensions/sts/sts-api/build.gradle.kts b/extensions/sts/sts-api/build.gradle.kts
index 7e3ab3584..1a5f53c54 100644
--- a/extensions/sts/sts-api/build.gradle.kts
+++ b/extensions/sts/sts-api/build.gradle.kts
@@ -32,6 +32,6 @@ dependencies {
 
 edcBuild {
     swagger {
-        apiGroup.set("sts-api")
+        apiGroup("sts-api")
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 391449aca..9929fca76 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -116,4 +116,5 @@ connector = [
 
 [plugins]
 edc-build = { id = "org.eclipse.edc.edc-build", version = "1.5.2" }
+autodoc = { id = "org.eclipse.edc.autodoc", version.ref = "edc" }
 shadow = { id = "com.gradleup.shadow", version = "9.5.1" }
diff --git a/protocols/dcp/dcp-identityhub/credential-offer-api/build.gradle.kts b/protocols/dcp/dcp-identityhub/credential-offer-api/build.gradle.kts
index 35208906d..3bbc4184c 100644
--- a/protocols/dcp/dcp-identityhub/credential-offer-api/build.gradle.kts
+++ b/protocols/dcp/dcp-identityhub/credential-offer-api/build.gradle.kts
@@ -41,6 +41,6 @@ dependencies {
 
 edcBuild {
     swagger {
-        apiGroup.set("credentials-api")
+        apiGroup("credentials-api")
     }
 }
diff --git a/protocols/dcp/dcp-identityhub/credentials-api-configuration/build.gradle.kts b/protocols/dcp/dcp-identityhub/credentials-api-configuration/build.gradle.kts
index 63baea31b..c0406f27a 100644
--- a/protocols/dcp/dcp-identityhub/credentials-api-configuration/build.gradle.kts
+++ b/protocols/dcp/dcp-identityhub/credentials-api-configuration/build.gradle.kts
@@ -41,6 +41,6 @@ dependencies {
 
 edcBuild {
     swagger {
-        apiGroup.set("credentials-api")
+        apiGroup("credentials-api")
     }
 }
diff --git a/protocols/dcp/dcp-identityhub/presentation-api/build.gradle.kts b/protocols/dcp/dcp-identityhub/presentation-api/build.gradle.kts
index 7a480a4e9..8436db35b 100644
--- a/protocols/dcp/dcp-identityhub/presentation-api/build.gradle.kts
+++ b/protocols/dcp/dcp-identityhub/presentation-api/build.gradle.kts
@@ -38,6 +38,6 @@ dependencies {
 
 edcBuild {
     swagger {
-        apiGroup.set("credentials-api")
+        apiGroup("credentials-api")
     }
 }
diff --git a/protocols/dcp/dcp-identityhub/storage-api/build.gradle.kts b/protocols/dcp/dcp-identityhub/storage-api/build.gradle.kts
index 3039f23a6..48eabb5e6 100644
--- a/protocols/dcp/dcp-identityhub/storage-api/build.gradle.kts
+++ b/protocols/dcp/dcp-identityhub/storage-api/build.gradle.kts
@@ -42,6 +42,6 @@ dependencies {
 
 edcBuild {
     swagger {
-        apiGroup.set("credentials-api")
+        apiGroup("credentials-api")
     }
 }
diff --git a/protocols/dcp/dcp-issuer/dcp-issuer-api/build.gradle.kts b/protocols/dcp/dcp-issuer/dcp-issuer-api/build.gradle.kts
index 122d3e9b4..89a55fc78 100644
--- a/protocols/dcp/dcp-issuer/dcp-issuer-api/build.gradle.kts
+++ b/protocols/dcp/dcp-issuer/dcp-issuer-api/build.gradle.kts
@@ -41,6 +41,6 @@ dependencies {
 
 edcBuild {
     swagger {
-        apiGroup.set("issuer-api")
+        apiGroup("issuer-api")
     }
 }
diff --git a/spi/participant-context-spi/build.gradle.kts b/spi/participant-context-spi/build.gradle.kts
index fcf52ca74..1e6a24ac9 100644
--- a/spi/participant-context-spi/build.gradle.kts
+++ b/spi/participant-context-spi/build.gradle.kts
@@ -17,11 +17,8 @@ plugins {
     `maven-publish`
 }
 
-val swagger: String by project
-
 dependencies {
     api(libs.edc.spi.core)
-    implementation(libs.edc.spi.core) // ParticipantManifest#serviceEndpoint
     implementation(libs.opentelemetry.api)
     testImplementation(libs.edc.lib.jsonld)
 }