diff --git a/biosdk-services/src/main/java/io/mosip/biosdk/services/SdkApplication.java b/biosdk-services/src/main/java/io/mosip/biosdk/services/SdkApplication.java
index 77c4769..4eaffc1 100644
--- a/biosdk-services/src/main/java/io/mosip/biosdk/services/SdkApplication.java
+++ b/biosdk-services/src/main/java/io/mosip/biosdk/services/SdkApplication.java
@@ -13,10 +13,9 @@
  * be added without rebuilding this service.
  * </p>
  * <p>
- * There is no JDBC datasource. A local fat mock-sdk JAR on {@code loader.path}
- * may register Hibernate/Hikari auto-config; {@code application-local.properties}
- * excludes those so Boot does not require a database URL. The cluster profile
- * must not exclude them unless they are actual auto-configuration classes.
+ * There is no JDBC datasource. Vendor or mock-sdk JARs on {@code loader.path}
+ * may register Hibernate/Hikari; those auto-configurations are excluded in
+ * {@code application.properties} so Boot does not require a database URL.
  * </p>
  *
  * @since 1.0
diff --git a/biosdk-services/src/main/resources/application-local.properties b/biosdk-services/src/main/resources/application-local.properties
index b574e0c..eae0662 100644
--- a/biosdk-services/src/main/resources/application-local.properties
+++ b/biosdk-services/src/main/resources/application-local.properties
@@ -1,13 +1,5 @@
 # Local profile: run-local.bat|sh passes -Dspring.profiles.active=local
 spring.cloud.config.enabled=false
-# Fat mock-sdk-*-jar-with-dependencies.jar on loader.path registers Boot JDBC/JPA.
-# Cluster zip does not, so these excludes must not be in the default profile.
-spring.autoconfigure.exclude=\
-org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration,\
-org.springframework.boot.jdbc.autoconfigure.DataSourceInitializationAutoConfiguration,\
-org.springframework.boot.jdbc.autoconfigure.DataSourceTransactionManagerAutoConfiguration,\
-org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration,\
-${biosdk.kernel.autoconfigure.exclude}
 server.tomcat.accesslog.enabled=false
 # Swagger Try-it-out target for this machine only. Cluster uses mosipbox.public.url from config server.
 mosipbox.public.url=http://localhost:${server.port}
diff --git a/biosdk-services/src/main/resources/application.properties b/biosdk-services/src/main/resources/application.properties
index 1641ad6..9a85731 100644
--- a/biosdk-services/src/main/resources/application.properties
+++ b/biosdk-services/src/main/resources/application.properties
@@ -32,12 +32,13 @@ management.metrics.export.prometheus.enabled=true
 
 logging.level.root=INFO
 
-# kernel-core 1.4.1 EnableAutoConfiguration list (ID gen, PDF, websub, applicant-type).
-# This module is an IBioApiV2 HTTP wrapper — do not start those beans.
-# Do not exclude Boot JDBC/JPA here: cluster mock-sdk zip can put those classes on
-# loader.path without registering them as auto-config, and Boot 4 then fails startup.
-# Local fat mock-sdk does register them; those excludes live in application-local.properties.
-biosdk.kernel.autoconfigure.exclude=\
+# kernel-core EnableAutoConfiguration list (ID gen, PDF, websub, applicant-type).
+# Fat mock-sdk on loader.path also registers Hibernate/Hikari; this service has no DB.
+spring.autoconfigure.exclude=\
+org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration,\
+org.springframework.boot.jdbc.autoconfigure.DataSourceInitializationAutoConfiguration,\
+org.springframework.boot.jdbc.autoconfigure.DataSourceTransactionManagerAutoConfiguration,\
+org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration,\
 io.mosip.kernel.idgenerator.vid.impl.VidGeneratorImpl,\
 io.mosip.kernel.idgenerator.vid.util.VidFilterUtils,\
 io.mosip.kernel.idgenerator.tokenid.impl.TokenIdGeneratorImpl,\
@@ -62,7 +63,6 @@ io.mosip.kernel.websub.api.config.IntentVerificationConfig,\
 io.mosip.kernel.websub.api.config.WebSubClientConfig,\
 io.mosip.kernel.websub.api.config.publisher.WebSubPublisherClientConfig,\
 io.mosip.kernel.websub.api.config.publisher.RestTemplateHelper
-spring.autoconfigure.exclude=${biosdk.kernel.autoconfigure.exclude}
 
 openapi.info.title=Biosdk Service
 openapi.info.description=Rest Endpoints for operations related to Biosdk