diff --git a/.github/workflows/secret-scanning.yml b/.github/workflows/secret-scanning.yml
deleted file mode 100644
index 31ff6c9..0000000
--- a/.github/workflows/secret-scanning.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Secret Scanning
-on:
-  pull_request:
-    branches:
-      - master
-      - main
-  schedule:
-    - cron: '0 4 * * 4' # Every Thursday at 04:00
-  workflow_dispatch:
-
-jobs:
-  scan:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
-      - uses: hmcts/secrets-scanner@main
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          gitleaks_license: ${{ secrets.GITLEAKS_LICENSE }}
-          gitleaks_regex_internal_url: ${{ secrets.HMCTS_CP_GITLEAKS_REGEX_INTERNAL_URL }}
diff --git a/build.gradle b/build.gradle
index c92660f..1daf8a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,9 +14,6 @@ group = 'uk.gov.hmcts.cp'
 version = System.getProperty('ARTEFACT_VERSION') ?: '0.0.999'
 
 apply {
-  from("$rootDir/gradle/java-core.gradle")
-  from("$rootDir/gradle/spring-core.gradle")
-
   from("$rootDir/gradle/repositories.gradle")
   from("$rootDir/gradle/dependency.gradle")
   from("$rootDir/gradle/pmd.gradle")
@@ -26,9 +23,42 @@ apply {
   from("$rootDir/gradle/apitest.gradle")
 }
 
+// We MUST keep all dependencies in the build.gradle to allow dependabot to provide version updates
+// Sadly, dependabot does not track dependencies in the apply-from files
 dependencies {
+  // Api spec
   implementation "uk.gov.hmcts.cp:api-cp-crime-schedulingandlisting-courtschedule:1.1.0"
 
+
+  // Java core
+  implementation 'net.logstash.logback:logstash-logback-encoder:8.1'
+  implementation 'org.apache.logging.log4j:log4j-to-slf4j'
+  implementation 'ch.qos.logback:logback-classic'
+  implementation 'ch.qos.logback:logback-core'
+  implementation "org.owasp.encoder:encoder:1.2.3"
+
+  compileOnly group: 'org.projectlombok', name: 'lombok', version: "1.18.40"
+  annotationProcessor group: 'org.projectlombok', name: 'lombok', version: "1.18.40"
+  testCompileOnly group: 'org.projectlombok', name: 'lombok', version: "1.18.40"
+  testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: "1.18.40"
+
+  implementation "org.mapstruct:mapstruct:1.5.5.Final"
+  annotationProcessor "org.mapstruct:mapstruct-processor:1.5.5.Final"
+
+
+  // Spring boot core
+  implementation "org.springframework.boot:spring-boot-starter-web"
+  implementation "org.springframework.boot:spring-boot-starter-aspectj"
+  implementation "org.springframework.boot:spring-boot-starter-actuator"
+  implementation "org.springframework.boot:spring-boot-starter-validation"
+
+  testImplementation "org.springframework.boot:spring-boot-starter-webmvc-test"
+  testImplementation "org.springframework.boot:spring-boot-starter-test"
+
+  testImplementation 'org.wiremock.integrations:wiremock-spring-boot:4.1.0'
+  testImplementation 'org.wiremock:wiremock-standalone:3.13.2'
+
+
   implementation 'org.springframework.boot:spring-boot-starter-actuator'
   implementation 'org.springframework.boot:spring-boot-starter-opentelemetry'
 }
\ No newline at end of file
diff --git a/gradle/java-core.gradle b/gradle/java-core.gradle
deleted file mode 100644
index 1f676de..0000000
--- a/gradle/java-core.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-ext {
-  log4JVersion = "2.24.3"
-  logbackVersion = "1.5.18"
-  lombokVersion = "1.18.40"
-  mapstructVersion = "1.5.5.Final"
-}
-
-dependencies {
-  implementation 'net.logstash.logback:logstash-logback-encoder:8.1'
-  implementation 'org.apache.logging.log4j:log4j-to-slf4j'
-  implementation 'ch.qos.logback:logback-classic'
-  implementation 'ch.qos.logback:logback-core'
-  implementation "org.owasp.encoder:encoder:1.2.3"
-
-  compileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion
-  annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion
-  testCompileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion
-  testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion
-
-  implementation "org.mapstruct:mapstruct:$mapstructVersion"
-  annotationProcessor "org.mapstruct:mapstruct-processor:$mapstructVersion"
-}
-
-tasks.named('wrapper') {
-  delete "${projectDir}/gradlew.bat"
-}
\ No newline at end of file
diff --git a/gradle/spring-core.gradle b/gradle/spring-core.gradle
deleted file mode 100644
index e382f2a..0000000
--- a/gradle/spring-core.gradle
+++ /dev/null
@@ -1,12 +0,0 @@
-dependencies {
-  implementation "org.springframework.boot:spring-boot-starter-web"
-  implementation "org.springframework.boot:spring-boot-starter-aspectj"
-  implementation "org.springframework.boot:spring-boot-starter-actuator"
-  implementation "org.springframework.boot:spring-boot-starter-validation"
-
-  testImplementation "org.springframework.boot:spring-boot-starter-webmvc-test"
-  testImplementation "org.springframework.boot:spring-boot-starter-test"
-
-  testImplementation 'org.wiremock.integrations:wiremock-spring-boot:4.1.0'
-  testImplementation 'org.wiremock:wiremock-standalone:3.13.2'
-}
\ No newline at end of file