diff --git a/build.gradle.kts b/build.gradle.kts
index 1b5534f..8d95d22 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,35 +1,52 @@
 plugins {
-	java
-	id("org.springframework.boot") version "4.0.0-RC1"
-	id("io.spring.dependency-management") version "1.1.7"
+    java
+    id("org.springframework.boot") version "4.0.0-RC2"
+    id("io.spring.dependency-management") version "1.1.7"
+    id("com.diffplug.spotless") version "8.0.0"
 }
 val springCloudVersion by extra("2025.1.0-M4")
 
 group = "com.github.8g4b"
 version = "1.0"
 
+spotless {
+    java {
+        target("src/main/java/**/*.java", "src/test/java/**/*.java")
+        eclipse()
+        leadingTabsToSpaces(4)
+        importOrder("java", "javax", "org", "com", "")
+        removeUnusedImports()
+        endWithNewline()
+        trimTrailingWhitespace()
+    }
+    kotlinGradle {
+        target("*.gradle.kts")
+        ktlint()
+    }
+}
+
 java {
-	toolchain {
-		languageVersion = JavaLanguageVersion.of(25)
-	}
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(25)
+    }
 }
 
 configurations {
-	compileOnly {
-		extendsFrom(configurations.annotationProcessor.get())
-	}
+    compileOnly {
+        extendsFrom(configurations.annotationProcessor.get())
+    }
 }
 
 repositories {
-	mavenCentral()
+    mavenCentral()
 }
 
 dependencies {
     // Spring Boot Starters
-	implementation("org.springframework.boot:spring-boot-starter-security")
-	implementation("org.springframework.boot:spring-boot-starter-security-oauth2-client")
-	implementation("org.springframework.boot:spring-boot-starter-validation")
-	implementation("org.springframework.boot:spring-boot-starter-webmvc")
+    implementation("org.springframework.boot:spring-boot-starter-security")
+    implementation("org.springframework.boot:spring-boot-starter-security-oauth2-client")
+    implementation("org.springframework.boot:spring-boot-starter-validation")
+    implementation("org.springframework.boot:spring-boot-starter-webmvc")
 
     // Spring Data
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
@@ -45,22 +62,23 @@ dependencies {
     // Lombok
     compileOnly("org.projectlombok:lombok")
     annotationProcessor("org.projectlombok:lombok")
+
     // Development Tools
-	developmentOnly("org.springframework.boot:spring-boot-devtools")
-	developmentOnly("org.springframework.boot:spring-boot-docker-compose")
+    developmentOnly("org.springframework.boot:spring-boot-devtools")
+    developmentOnly("org.springframework.boot:spring-boot-docker-compose")
 
     // Database Driver
-	runtimeOnly("com.mysql:mysql-connector-j")
+    runtimeOnly("com.mysql:mysql-connector-j")
 
     // Testing
-	testImplementation("org.springframework.boot:spring-boot-starter-data-jpa-test")
-	testImplementation("org.springframework.boot:spring-boot-starter-data-redis-test")
-	testImplementation("org.springframework.boot:spring-boot-starter-security-oauth2-client-test")
-	testImplementation("org.springframework.boot:spring-boot-starter-security-test")
-	testImplementation("org.springframework.boot:spring-boot-starter-thymeleaf-test")
-	testImplementation("org.springframework.boot:spring-boot-starter-validation-test")
-	testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+    testImplementation("org.springframework.boot:spring-boot-starter-data-jpa-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-data-redis-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-security-oauth2-client-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-security-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-thymeleaf-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-validation-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 dependencyManagement {
@@ -70,5 +88,5 @@ dependencyManagement {
 }
 
 tasks.withType<Test> {
-	useJUnitPlatform()
+    useJUnitPlatform()
 }
diff --git a/src/test/java/com/github/_g4b/Springboot_Project_Template/SpringbootProjectTemplateApplicationTests.java b/src/test/java/com/github/_g4b/Springboot_Project_Template/SpringbootProjectTemplateApplicationTests.java
index 980dd3b..b75bc35 100644
--- a/src/test/java/com/github/_g4b/Springboot_Project_Template/SpringbootProjectTemplateApplicationTests.java
+++ b/src/test/java/com/github/_g4b/Springboot_Project_Template/SpringbootProjectTemplateApplicationTests.java
@@ -6,8 +6,8 @@
 @SpringBootTest
 class SpringbootProjectTemplateApplicationTests {
 
-	@Test
-	void contextLoads() {
-	}
+    @Test
+    void contextLoads() {
+    }
 
 }