diff --git a/application/pom.xml b/application/pom.xml
index 9b5257e..593c705 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -154,6 +154,7 @@
           <mainClass>org.ehrbase.migration.application.MigrationTool</mainClass>
           <image>
             <name>${image.name}:${image.tag}</name>
+            <builder>paketobuildpacks/builder-noble-java-tiny:0.0.69</builder>
             <env>
               <BP_DEBUG_ENABLED>true</BP_DEBUG_ENABLED>
             </env>
diff --git a/application/src/test/java/org/ehrbase/migration/application/MigrationToolIT.java b/application/src/test/java/org/ehrbase/migration/application/MigrationToolIT.java
index 99796a4..425c1f0 100644
--- a/application/src/test/java/org/ehrbase/migration/application/MigrationToolIT.java
+++ b/application/src/test/java/org/ehrbase/migration/application/MigrationToolIT.java
@@ -101,6 +101,7 @@ public static class Initializer implements ApplicationContextInitializer<Configu
         @Override
         public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
             var values = TestPropertyValues.of(
+                    "spring.datasource.export.enable=true",
                     "spring.datasource.export.url=jdbc:postgresql://%s:%d/ehrbase"
                             .formatted(
                                     postgresOld.getHost(), postgresOld.getMappedPort(EHRbasePostgresOldContainer.PORT)),
diff --git a/service/pom.xml b/service/pom.xml
index 2529880..ee79257 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -149,6 +149,9 @@
         </executions>
         <configuration>
           <skip>true</skip>
+          <image>
+            <builder>paketobuildpacks/builder-noble-java-tiny:0.0.69</builder>
+          </image>
         </configuration>
       </plugin>
 
diff --git a/service/src/main/java/org/ehrbase/migration/config/ExportDatasourceConfiguration.java b/service/src/main/java/org/ehrbase/migration/config/ExportDatasourceConfiguration.java
index f02afec..a232496 100644
--- a/service/src/main/java/org/ehrbase/migration/config/ExportDatasourceConfiguration.java
+++ b/service/src/main/java/org/ehrbase/migration/config/ExportDatasourceConfiguration.java
@@ -40,7 +40,7 @@
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ConditionalOnProperty("spring.datasource.export.enable")
+@ConditionalOnProperty(name = "spring.datasource.export.enable", havingValue = "true")
 public class ExportDatasourceConfiguration {
 
     @Bean
diff --git a/service/src/main/java/org/ehrbase/migration/exporter/ExportServiceConfiguration.java b/service/src/main/java/org/ehrbase/migration/exporter/ExportServiceConfiguration.java
index 0051efe..efd6eac 100644
--- a/service/src/main/java/org/ehrbase/migration/exporter/ExportServiceConfiguration.java
+++ b/service/src/main/java/org/ehrbase/migration/exporter/ExportServiceConfiguration.java
@@ -21,15 +21,15 @@
 import org.ehrbase.migration.exporter.v0.ExportServiceV0Imp;
 import org.jooq.DSLContext;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
+@ConditionalOnProperty(name = "spring.datasource.export.enable", havingValue = "true")
 public class ExportServiceConfiguration {
 
     @Bean
-    @ConditionalOnBean(name = "exportDslContext")
     ExportService exportService(
             @Qualifier("exportDslContext") DSLContext context,
             ExportDatasourceConfiguration.TenantHandlingExportConnectionProvider connectionProvider) {