diff --git a/spring/build.gradle b/spring/build.gradle
deleted file mode 100644
index d78c209..0000000
--- a/spring/build.gradle
+++ /dev/null
@@ -1,33 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:2.1.6.RELEASE")
-    }
-}
-
-apply plugin: 'java'
-apply plugin: 'eclipse'
-apply plugin: 'idea'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
-
-bootJar {
-    baseName = 'gs-rest-service'
-    version =  '0.1.0'
-}
-
-repositories {
-    mavenCentral()
-}
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
-dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter-data-jdbc'
-	runtimeOnly 'com.h2database:h2'
-    compile("org.springframework.boot:spring-boot-starter-web")
-    testCompile('org.springframework.boot:spring-boot-starter-test')
-}
\ No newline at end of file
diff --git a/spring/build.gradle.kts b/spring/build.gradle.kts
new file mode 100644
index 0000000..ca8adc3
--- /dev/null
+++ b/spring/build.gradle.kts
@@ -0,0 +1,34 @@
+plugins {
+    java
+    id("idea")
+    id("eclipse")
+    id("org.springframework.boot") version "3.5.0"
+    id("io.spring.dependency-management") version "1.1.7"
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+        vendor = JvmVendorSpec.ADOPTIUM
+    }
+}
+
+
+dependencies {
+    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
+
+    // Database
+    runtimeOnly("com.h2database:h2")
+
+    // Testing
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+}
diff --git a/spring/gradle/wrapper/gradle-wrapper.properties b/spring/gradle/wrapper/gradle-wrapper.properties
index 186b715..c6406bc 100644
--- a/spring/gradle/wrapper/gradle-wrapper.properties
+++ b/spring/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/spring/settings.gradle b/spring/settings.gradle
deleted file mode 100644
index ebf1ef8..0000000
--- a/spring/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'spring'
diff --git a/spring/settings.gradle.kts b/spring/settings.gradle.kts
new file mode 100644
index 0000000..4502f43
--- /dev/null
+++ b/spring/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name = "spring"
diff --git a/spring/src/main/java/com/intercom/spring/WebConfig.java b/spring/src/main/java/com/intercom/spring/WebConfig.java
index f8b65c9..d891db3 100644
--- a/spring/src/main/java/com/intercom/spring/WebConfig.java
+++ b/spring/src/main/java/com/intercom/spring/WebConfig.java
@@ -3,14 +3,14 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
 @EnableWebMvc
-public class WebConfig extends WebMvcConfigurerAdapter {
+public class WebConfig implements WebMvcConfigurer {
 
 	@Override
 	public void addCorsMappings(CorsRegistry registry) {
 		registry.addMapping("/**");
 	}
-}
\ No newline at end of file
+}
diff --git a/spring/src/main/resources/application.properties b/spring/src/main/resources/application.properties
index 070b7d4..c0e2258 100644
--- a/spring/src/main/resources/application.properties
+++ b/spring/src/main/resources/application.properties
@@ -1,9 +1,12 @@
+server.port=3000
+
 spring.h2.console.enabled=true
+
 spring.datasource.name=minicom
+spring.datasource.username=sa
+spring.datasource.password=
+spring.datasource.url=jdbc:h2:file:./minicom.db;DB_CLOSE_ON_EXIT=FALSE;IFEXISTS=FALSE;DB_CLOSE_DELAY=-1;
 spring.datasource.driverClassName=org.h2.Driver
 
-spring.datasource.initialize=false
-spring.datasource.url=jdbc:h2:file:~/minicom;DB_CLOSE_ON_EXIT=FALSE;IFEXISTS=FALSE;DB_CLOSE_DELAY=-1;
-
-spring.jpa.hibernate.ddl-auto = update
-server.port=3000
\ No newline at end of file
+spring.sql.init.mode=always
+spring.sql.init.schema-locations=classpath:schema.sql