diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0e742b94c..f743081a7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -23,7 +23,7 @@ jobs:
           GRADLE_CLI_OPTS: ""
         run: "chmod +x ./gradlew && ./gradlew ${GRADLE_CLI_OPTS} -Pversion=${API_VERSION} build jacocoTestReport"
       - name: Build and push Docker images
-        if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags')
+        if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/cds' || startsWith(github.ref, 'refs/tags')
         uses: docker/build-push-action@v1.1.1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
diff --git a/build.gradle b/build.gradle
index d2d0c9d69..bd0e1839f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,7 @@ buildscript {
 plugins {
   id "java"
   id "org.springframework.boot" version "3.3.1"
+  id "org.springframework.boot.aot" version "3.3.1"
   id "idea"
   id "com.adarshr.test-logger" version "4.0.0"
 }
@@ -39,7 +40,7 @@ configurations {
 
 idea {
   module {
-    testSourceDirs += file('src/inttest/java')
+    testSources = files(file("src/test/java"), file("src/inttest/java"))
   }
 }
 
@@ -66,7 +67,7 @@ configurations {
 }
 
 
-task inttest(type: Test) {
+tasks.register('inttest', Test) {
   group = LifecycleBasePlugin.VERIFICATION_GROUP
   description = "Runs the integration tests."
 
@@ -105,13 +106,14 @@ configurations {
   codacy
 }
 
-task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoTestReport) {
+tasks.register('sendCoverageToCodacy', JavaExec) {
+  dependsOn jacocoTestReport
   mainClass = "com.codacy.CodacyCoverageReporter"
   classpath = configurations.codacy
   args = ["report", "-l", "Java", "-r", "${buildDir}/reports/jacoco/test/jacocoTestReport.xml"]
 }
 
-configurations.all {
+configurations.configureEach {
   // Cache -SNAPSHOT for 60 seconds only
   resolutionStrategy.cacheChangingModulesFor 60, 'seconds'
 }
diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml
index a4d856cc8..390db4cd7 100644
--- a/src/main/resources/config/application.yml
+++ b/src/main/resources/config/application.yml
@@ -127,6 +127,8 @@ spring:
   jackson:
     serialization:
       WRITE_DATES_AS_TIMESTAMPS: false
+  profiles:
+    active: ${API_PROFILE}
   servlet:
     multipart:
       max-file-size: 350MB