diff --git a/package-lock.json b/package-lock.json
index 6819c79..e07837c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6258,9 +6258,9 @@
             }
         },
         "node_modules/vite": {
-            "version": "5.0.11",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.11.tgz",
-            "integrity": "sha512-XBMnDjZcNAw/G1gEiskiM1v6yzM4GE5aMGvhWTlHAYYhxb7S3/V1s3m2LDHa8Vh6yIWYYB0iJwsEaS523c4oYA==",
+            "version": "5.0.12",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz",
+            "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==",
             "dev": true,
             "dependencies": {
                 "esbuild": "^0.19.3",
diff --git a/src/generator/spring/template/build.gradle.kts.txt b/src/generator/spring/template/build.gradle.kts.txt
index fc98368..24e1c0e 100644
--- a/src/generator/spring/template/build.gradle.kts.txt
+++ b/src/generator/spring/template/build.gradle.kts.txt
@@ -189,24 +189,24 @@ spotless {
     }
     kotlinGradle {
         target("*.gradle.kts") // default target for kotlinGradle
+        ktlint("1.1.1").editorConfigOverride(mapOf("indent_size" to 4, "max_line_length" to 120))
         toggleOffOn("formatter:off", "formatter:on")
-        ktlint("0.50.1").editorConfigOverride(mapOf("indent_size" to 4, "max_line_length" to 120))
         indentWithSpaces(4)
+        endWithNewline()
         trimTrailingWhitespace()
     }
     {%- if javaSelected -%}
     java {
-        palantirJavaFormat()
         target("src/*/java/**/*.java")
-        palantirJavaFormat('2.39.0').style("AOSP")
+        palantirJavaFormat("2.39.0").style("AOSP")
         removeUnusedImports()
         toggleOffOn("formatter:off", "formatter:on")
     }
     {%- else -%}
     kotlin {
-        ktlint("0.47.1").editorConfigOverride(mapOf("indent_size" to 4, "max_line_length" to 120))
-        target("src/*/kotlin/**/*.kt")
+        ktlint("1.1.1").editorConfigOverride(mapOf("indent_size" to 4, "max_line_length" to 120))
         toggleOffOn("formatter:off", "formatter:on")
+        target("src/*/kotlin/**/*.kt")
         indentWithSpaces(4)
         endWithNewline()
         trimTrailingWhitespace()
diff --git a/src/generator/spring/template/pom.xml.txt b/src/generator/spring/template/pom.xml.txt
index 1b17ed2..b994cc8 100644
--- a/src/generator/spring/template/pom.xml.txt
+++ b/src/generator/spring/template/pom.xml.txt
@@ -1,454 +1,477 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.1</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
-	<groupId>{{ metadata.group }}</groupId>
-	<artifactId>{{ metadata.artifact }}</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>{{ metadata.name }}</name>
-	<description>{{ metadata.description | strip | strip_html | truncate: 512 }}</description>
-	<properties>
-		<java.version>{{ jdkSourceCompatibility }}</java.version>
-		{%- if kotlinSelected -%}
-		<kotlin.version>{{ kotlinPlugin }}</kotlin.version>
-		{%- endif -%}
-		{%- if haveSpringCloudDependency -%}
-        <spring-cloud.version>{{ springCloudVersion }}</spring-cloud.version>
-        {%- endif -%}
-        {%- if haveSpringShellDependency -%}
-        <spring-shell.version>{{ springShellVersion }}</spring-shell.version>
-        {%- endif -%}
-        {%- if haveTimeFoldSolverDependency -%}
-        <timefold-solver.version>1.6.0</timefold-solver.version>
-        {%- endif -%}
-	</properties>
-	<dependencies>
-	    {%- if includeActuatorExplicitly -%}
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        {%- endif -%}
-        {%- if kotlinSelected -%}
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-reflect</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-        </dependency>
-            {%- if dependenciesIds contains "web" or dependenciesIds contains "webflux" -%}
-        <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
-            <artifactId>jackson-module-kotlin</artifactId>
-        </dependency>
-            {%- endif -%}
-            {%- if dependenciesIds contains "webflux" or dependenciesIds contains "data-r2dbc" or dependenciesIds contains "data-redis-reactive" or dependenciesIds contains "rsocket" -%}
-        <dependency>
-            <groupId>io.projectreactor.kotlin</groupId>
-            <artifactId>reactor-kotlin-extensions</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-coroutines-reactor</artifactId>
-        </dependency>
-        {%- endif -%}
-        {%- endif -%}
-        {%- for dependency in dependencies -%}
-        <dependency>
-            <groupId>{{ dependency.groupId }}</groupId>
-            <artifactId>{{ dependency.artifactId }}</artifactId>
-        </dependency>
-        {%- if dependency.id == "security" and dependenciesIds contains "thymeleaf" -%}
-        <dependency>
-            <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity6</artifactId>
-        </dependency>
-        {%- endif -%}
-        {%- else -%}
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-		</dependency>
-		{%- if includeActuatorExplicitly == false -%}
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-        	<artifactId>spring-boot-starter</artifactId>
-        </dependency>
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>3.2.1</version>
+    <relativePath/> <!-- lookup parent from repository -->
+  </parent>
+  <groupId>{{ metadata.group }}</groupId>
+  <artifactId>{{ metadata.artifact }}</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <name>{{ metadata.name }}</name>
+  <description>{{ metadata.description | strip | strip_html | truncate: 512 }}</description>
+  <properties>
+    <java.version>{{ jdkSourceCompatibility }}</java.version>
+    {%- if kotlinSelected -%}
+    <kotlin.version>{{ kotlinPlugin }}</kotlin.version>
+    {%- endif -%}
+    {%- if haveSpringCloudDependency -%}
+    <spring-cloud.version>{{ springCloudVersion }}</spring-cloud.version>
+    {%- endif -%}
+    {%- if haveSpringShellDependency -%}
+    <spring-shell.version>{{ springShellVersion }}</spring-shell.version>
+    {%- endif -%}
+    {%- if haveTimeFoldSolverDependency -%}
+    <timefold-solver.version>1.6.0</timefold-solver.version>
+    {%- endif -%}
+  </properties>
+  <dependencies>
+    {%- if includeActuatorExplicitly -%}
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+    </dependency>
+    {%- endif -%}
+    {%- if kotlinSelected -%}
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-reflect</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib</artifactId>
+    </dependency>
+      {%- if dependenciesIds contains "web" or dependenciesIds contains "webflux" -%}
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-kotlin</artifactId>
+    </dependency>
+      {%- endif -%}
+      {%- if dependenciesIds contains "webflux" or dependenciesIds contains "data-r2dbc" or dependenciesIds contains "data-redis-reactive" or dependenciesIds contains "rsocket" -%}
+    <dependency>
+      <groupId>io.projectreactor.kotlin</groupId>
+      <artifactId>reactor-kotlin-extensions</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlinx</groupId>
+      <artifactId>kotlinx-coroutines-reactor</artifactId>
+    </dependency>
+    {%- endif -%}
+    {%- endif -%}
+    {%- for dependency in dependencies -%}
+    <dependency>
+      <groupId>{{ dependency.groupId }}</groupId>
+      <artifactId>{{ dependency.artifactId }}</artifactId>
+    </dependency>
+    {%- if dependency.id == "security" and dependenciesIds contains "thymeleaf" -%}
+    <dependency>
+      <groupId>org.thymeleaf.extras</groupId>
+      <artifactId>thymeleaf-extras-springsecurity6</artifactId>
+    </dependency>
+    {%- endif -%}
+    {%- else -%}
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+    </dependency>
+    {%- if includeActuatorExplicitly == false -%}
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+    </dependency>
+    {%- endif -%}
+    {%- endfor -%}
+    {%- if dependenciesIds.size == 1 and dependenciesIds contains "timefold-solver" -%}
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+    </dependency>
+    {%- endif -%}
+    {%- for developmentDependency in developmentDependencies -%}
+    <dependency>
+      <groupId>{{ developmentDependency.groupId }}</groupId>
+      <artifactId>{{ developmentDependency.artifactId }}</artifactId>
+      <scope>runtime</scope>
+      <optional>true</optional>
+    </dependency>
+    {%- endfor -%}
+    {%- for annotationDependency in annotationDependencies -%}
+    <dependency>
+      <groupId>{{ annotationDependency.groupId }}</groupId>
+      <artifactId>{{ annotationDependency.artifactId }}</artifactId>
+      <optional>true</optional>
+    </dependency>
+    {%- endfor -%}
+    {%- unless dependenciesIds contains "distributed-tracing" -%}
+      {%- if dependenciesIds contains "zipkin" -%}
+    <dependency>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-tracing-bridge-brave</artifactId>
+    </dependency>
+      {%- endif -%}
+    {%- endunless -%}
+    {%- for runtimeDependency in runtimeDependencies -%}
+    <dependency>
+      <groupId>{{ runtimeDependency.groupId }}</groupId>
+      <artifactId>{{ runtimeDependency.artifactId }}</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+      {%- if runtimeDependency.id == 'wavefront' -%}
+        {%- if dependenciesIds contains "zipkin" or dependenciesIds contains "distributed-tracing" -%}
+    <dependency>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-registry-wavefront</artifactId>
+      <scope>runtime</scope>
+    </dependency>
         {%- endif -%}
-        {%- endfor -%}
-        {%- if dependenciesIds.size == 1 and dependenciesIds contains "timefold-solver" -%}
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-        	<artifactId>spring-boot-starter</artifactId>
-        </dependency>
+      {%- endif -%}
+      {%- if dependenciesIds contains "data-r2dbc" -%}
+        {%- if runtimeDependency.id == "h2" -%}
+      <dependency>
+        <groupId>io.r2dbc</groupId>
+        <artifactId>r2dbc-h2</artifactId>
+        <scope>runtime</scope>
+      </dependency>
+        {%- elsif runtimeDependency.id == "mariadb" -%}
+    <dependency>
+      <groupId>org.mariadb</groupId>
+      <artifactId>r2dbc-mariadb</artifactId>
+      <version>1.1.3</version>
+      <scope>runtime</scope>
+    </dependency>
+        {%- elsif runtimeDependency.id == "sqlserver" -%}
+    <dependency>
+      <groupId>io.r2dbc</groupId>
+      <artifactId>r2dbc-mssql</artifactId>
+      <version>1.0.0.RELEASE</version>
+      <scope>runtime</scope>
+    </dependency>
+        {%- elsif runtimeDependency.id == "postgresql" -%}
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>r2dbc-postgresql</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+        {%- elsif runtimeDependency.id == "mysql" -%}
+    <dependency>
+      <groupId>io.asyncer</groupId>
+      <artifactId>r2dbc-mysql</artifactId>
+      <scope>runtime</scope>
+    </dependency>
         {%- endif -%}
-        {%- for developmentDependency in developmentDependencies -%}
-        <dependency>
-            <groupId>{{ developmentDependency.groupId }}</groupId>
-            <artifactId>{{ developmentDependency.artifactId }}</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>
-        {%- endfor -%}
-        {%- for annotationDependency in annotationDependencies -%}
-        <dependency>
-            <groupId>{{ annotationDependency.groupId }}</groupId>
-            <artifactId>{{ annotationDependency.artifactId }}</artifactId>
-            <optional>true</optional>
-        </dependency>
-        {%- endfor -%}
-        {%- unless dependenciesIds contains "distributed-tracing" -%}
-            {%- if dependenciesIds contains "zipkin" -%}
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-tracing-bridge-brave</artifactId>
-        </dependency>
-            {%- endif -%}
-        {%- endunless -%}
-        {%- for runtimeDependency in runtimeDependencies -%}
-        <dependency>
-            <groupId>{{ runtimeDependency.groupId }}</groupId>
-            <artifactId>{{ runtimeDependency.artifactId }}</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-            {%- if runtimeDependency.id == 'wavefront' -%}
-                {%- if dependenciesIds contains "zipkin" or dependenciesIds contains "distributed-tracing" -%}
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-wavefront</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-                {%- endif -%}
-            {%- endif -%}
-            {%- if dependenciesIds contains "data-r2dbc" -%}
-                {%- if runtimeDependency.id == "h2" -%}
-            <dependency>
-                <groupId>io.r2dbc</groupId>
-                <artifactId>r2dbc-h2</artifactId>
-                <scope>runtime</scope>
-            </dependency>
-                {%- elsif runtimeDependency.id == "mariadb" -%}
-        <dependency>
-            <groupId>org.mariadb</groupId>
-            <artifactId>r2dbc-mariadb</artifactId>
-            <version>1.1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-                {%- elsif runtimeDependency.id == "sqlserver" -%}
-        <dependency>
-            <groupId>io.r2dbc</groupId>
-            <artifactId>r2dbc-mssql</artifactId>
-            <version>1.0.0.RELEASE</version>
-            <scope>runtime</scope>
-        </dependency>
-                {%- elsif runtimeDependency.id == "postgresql" -%}
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>r2dbc-postgresql</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-                {%- elsif runtimeDependency.id == "mysql" -%}
-        <dependency>
-            <groupId>io.asyncer</groupId>
-            <artifactId>r2dbc-mysql</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-                {%- endif -%}
-            {%- endif -%}
-        {%- endfor -%}
-        {%- for compileDependency in compileDependencies -%}
-        <dependency>
-        	<groupId>{{ compileDependency.groupId }}</groupId>
-        	<artifactId>{{ compileDependency.artifactId }}</artifactId>
-        	{%- if compileDependency.version -%}
-        	<version>{{ compileDependency.version }}</version>
-        	{%- endif -%}
-        </dependency>
-        {%- endfor -%}
-        {%- for testDependency in testDependencies -%}
-        <dependency>
-            <groupId>{{ testDependency.groupId }}</groupId>
-            <artifactId>{{ testDependency.artifactId }}</artifactId>
-            {%- if testDependency.version -%}
-            <version>{{ testDependency.version }}</version>
-            {%- endif -%}
-            <scope>test</scope>
-        </dependency>
-        {%- endfor -%}
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-    {%- if haveSpringShellDependency or haveSpringCloudDependency or haveTimeFoldSolverDependency -%}
+      {%- endif -%}
+    {%- endfor -%}
+    {%- for compileDependency in compileDependencies -%}
+    <dependency>
+      <groupId>{{ compileDependency.groupId }}</groupId>
+      <artifactId>{{ compileDependency.artifactId }}</artifactId>
+      {%- if compileDependency.version -%}
+      <version>{{ compileDependency.version }}</version>
+      {%- endif -%}
+    </dependency>
+    {%- endfor -%}
+    {%- for testDependency in testDependencies -%}
+    <dependency>
+      <groupId>{{ testDependency.groupId }}</groupId>
+      <artifactId>{{ testDependency.artifactId }}</artifactId>
+      {%- if testDependency.version -%}
+      <version>{{ testDependency.version }}</version>
+      {%- endif -%}
+      <scope>test</scope>
+    </dependency>
+    {%- endfor -%}
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  {%- if haveSpringShellDependency or haveSpringCloudDependency or haveTimeFoldSolverDependency -%}
 
-    <dependencyManagement>
-        <dependencies>
-            {%- if haveTimeFoldSolverDependency -%}
-            <dependency>
-                <groupId>ai.timefold.solver</groupId>
-                <artifactId>timefold-solver-bom</artifactId>
-                <version>${timefold-solver.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            {%- endif -%}
-            {%- if haveSpringShellDependency -%}
-            <dependency>
-                <groupId>org.springframework.shell</groupId>
-                <artifactId>spring-shell-dependencies</artifactId>
-                <version>${spring-shell.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            {%- endif -%}
-            {%- if haveSpringCloudDependency -%}
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            {%- endif -%}
-        </dependencies>
-    </dependencyManagement>
+  <dependencyManagement>
+    <dependencies>
+      {%- if haveTimeFoldSolverDependency -%}
+      <dependency>
+        <groupId>ai.timefold.solver</groupId>
+        <artifactId>timefold-solver-bom</artifactId>
+        <version>${timefold-solver.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      {%- endif -%}
+      {%- if haveSpringShellDependency -%}
+      <dependency>
+        <groupId>org.springframework.shell</groupId>
+        <artifactId>spring-shell-dependencies</artifactId>
+        <version>${spring-shell.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      {%- endif -%}
+      {%- if haveSpringCloudDependency -%}
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-dependencies</artifactId>
+        <version>${spring-cloud.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      {%- endif -%}
+    </dependencies>
+  </dependencyManagement>
 
+  {%- endif -%}
+  <build>
+    {%- if kotlinSelected -%}
+    <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
+    <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
     {%- endif -%}
-	<build>
-		{%- if kotlinSelected -%}
-		<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
-        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        {%- if haveLombok and explicitDockerImageForGradleIsRequired -%}
+        <configuration>
+          <image>
+            <builder>paketobuildpacks/builder-jammy-base:latest</builder>
+          </image>
+          <excludes>
+            <exclude>
+              <groupId>org.projectlombok</groupId>
+              <artifactId>lombok</artifactId>
+            </exclude>
+          </excludes>
+        </configuration>
+        {%- elsif haveLombok == false and explicitDockerImageForGradleIsRequired -%}
+        <configuration>
+          <image>
+            <builder>paketobuildpacks/builder-jammy-base:latest</builder>
+          </image>
+        </configuration>
+        {%- elsif haveLombok and explicitDockerImageForGradleIsRequired == false -%}
+        <configuration>
+          <excludes>
+            <exclude>
+              <groupId>org.projectlombok</groupId>
+              <artifactId>lombok</artifactId>
+            </exclude>
+          </excludes>
+        </configuration>
         {%- endif -%}
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				{%- if haveLombok and explicitDockerImageForGradleIsRequired -%}
-				<configuration>
-                    <image>
-                        <builder>paketobuildpacks/builder-jammy-base:latest</builder>
-                    </image>
-                    <excludes>
-                        <exclude>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                        </exclude>
-                    </excludes>
-                </configuration>
-				{%- elsif haveLombok == false and explicitDockerImageForGradleIsRequired -%}
-                <configuration>
-                    <image>
-                        <builder>paketobuildpacks/builder-jammy-base:latest</builder>
-                    </image>
-                </configuration>
-                {%- elsif haveLombok and explicitDockerImageForGradleIsRequired == false -%}
-                <configuration>
-                    <excludes>
-                        <exclude>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                        </exclude>
-                    </excludes>
-                </configuration>
-                {%- endif -%}
-			</plugin>
-			{%- if kotlinSelected -%}
-			<plugin>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <configuration>
-                    <args>
-                        <arg>-Xjsr305=strict</arg>
-                    </args>
-                    <compilerPlugins>
-                        <plugin>spring</plugin>
-                        {%- if dependenciesIds contains "data-jpa" -%}
-                        <plugin>jpa</plugin>
-                        {%- endif -%}
-                    </compilerPlugins>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.jetbrains.kotlin</groupId>
-                        <artifactId>kotlin-maven-allopen</artifactId>
-                        <version>${kotlin.version}</version>
-                    </dependency>
-                    {%- if dependenciesIds contains "data-jpa" -%}
-                    <dependency>
-                        <groupId>org.jetbrains.kotlin</groupId>
-                        <artifactId>kotlin-maven-noarg</artifactId>
-                        <version>${kotlin.version}</version>
-                    </dependency>
-                    {%- endif -%}
-                </dependencies>
-            </plugin>
-			{%- endif -%}
-			{%- for plugin in plugins -%}
-            {%- if plugin.id == "jacoco" -%}
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>{{ plugin.version }}</version>
-                <executions>
-                    <execution>
-                        <id>default-prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-report</id>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-check</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>CLASS</element>
-                                </rule>
-                            </rules>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>generate-code-coverage-report</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            {%- elsif plugin.id == "native" -%}
-            <plugin>
-                <groupId>org.graalvm.buildtools</groupId>
-                <artifactId>native-maven-plugin</artifactId>
-            </plugin>
-                {%- if dependenciesIds contains "data-jpa" -%}
-            <plugin>
-                <groupId>org.hibernate.orm.tooling</groupId>
-                <artifactId>hibernate-enhance-maven-plugin</artifactId>
-                <version>${hibernate.version}</version>
-                <executions>
-                    <execution>
-                        <id>enhance</id>
-                        <goals>
-                            <goal>enhance</goal>
-                        </goals>
-                        <configuration>
-                            <enableLazyInitialization>true</enableLazyInitialization>
-                            <enableDirtyTracking>true</enableDirtyTracking>
-                            <enableAssociationManagement>true</enableAssociationManagement>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-                {%- endif -%}
-            {%- elsif plugin.id == "graphql-code-generation" -%}
-            <plugin>
-                <groupId>io.github.deweyjose</groupId>
-                <artifactId>graphqlcodegen-maven-plugin</artifactId>
-                <version>1.50</version>
-                <executions>
-                    <execution>
-                        <id>dgs-codegen</id>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                        <configuration>
-                            <schemaPaths>
-                                <param>src/main/resources/graphql-client</param>
-                            </schemaPaths>
-                            <packageName>{{ metadata.group }}.{{ metadata.artifact }}.codegen</packageName>
-                            <addGeneratedAnnotation>true</addGeneratedAnnotation>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-dgs-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.build.directory}/generated-sources</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            {%- elsif plugin.id == "spotless" -%}
-            <!-- Spotless -->
-            <plugin>
-                <groupId>com.diffplug.spotless</groupId>
-                <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.42.0</version>
-                <configuration>
-                    <!-- optional: limit format enforcement to just the files changed by this feature branch -->
-                    <ratchetFrom>origin/main</ratchetFrom>
-                    <formats>
-                        <!-- you can define as many formats as you want, each is independent -->
-                        <format>
-                            <!-- define the files to apply to -->
-                            <includes>
-                                <include>.gitattributes</include>
-                                <include>.gitignore</include>
-                            </includes>
-                            <!-- define the steps to apply to those files -->
-                            <trimTrailingWhitespace/>
-                            <endWithNewline/>
-                            <indent>
-                                <tabs>false</tabs>
-                                <spacesPerTab>4</spacesPerTab>
-                            </indent>
-                        </format>
-                    </formats>
-                    <!-- define a language-specific format -->
-                    {%- if javaSelected -%}
-                    <java>
-                        <palantirJavaFormat>
-                            <version>2.39.0</version> <!-- optional -->
-                            <style>AOSP</style> <!-- or AOSP/GOOGLE (optional) -->
-                        </palantirJavaFormat>
-                        <removeUnusedImports />
-                        <indentWithSpace />
-                    </java>
-                    {%- else -%}
-                    <kotlin>
-                        <ktlint />
-                    </kotlin>
-                    {%- endif -%}
-                </configuration>
-            </plugin>
-            {%- elsif plugin.id == "sonarqubescanner" -%}
-            <plugin>
-                <groupId>org.sonarsource.scanner.maven</groupId>
-            	<artifactId>sonar-maven-plugin</artifactId>
-            	<version>3.10.0.2594</version>
-            </plugin>
+      </plugin>
+      {%- if kotlinSelected -%}
+      <plugin>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-maven-plugin</artifactId>
+        <configuration>
+          <args>
+            <arg>-Xjsr305=strict</arg>
+          </args>
+          <compilerPlugins>
+            <plugin>spring</plugin>
+            {%- if dependenciesIds contains "data-jpa" -%}
+            <plugin>jpa</plugin>
             {%- endif -%}
-            {%- endfor -%}
-		</plugins>
-	</build>
+          </compilerPlugins>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-maven-allopen</artifactId>
+            <version>${kotlin.version}</version>
+          </dependency>
+          {%- if dependenciesIds contains "data-jpa" -%}
+          <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-maven-noarg</artifactId>
+            <version>${kotlin.version}</version>
+          </dependency>
+          {%- endif -%}
+        </dependencies>
+      </plugin>
+      {%- endif -%}
+      {%- for plugin in plugins -%}
+      {%- if plugin.id == "jacoco" -%}
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>{{ plugin.version }}</version>
+        <executions>
+          <execution>
+            <id>default-prepare-agent</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>default-report</id>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>default-check</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <rule>
+                  <element>CLASS</element>
+                </rule>
+              </rules>
+            </configuration>
+          </execution>
+          <execution>
+            <id>generate-code-coverage-report</id>
+            <phase>test</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      {%- elsif plugin.id == "native" -%}
+      <plugin>
+        <groupId>org.graalvm.buildtools</groupId>
+        <artifactId>native-maven-plugin</artifactId>
+      </plugin>
+        {%- if dependenciesIds contains "data-jpa" -%}
+      <plugin>
+        <groupId>org.hibernate.orm.tooling</groupId>
+        <artifactId>hibernate-enhance-maven-plugin</artifactId>
+        <version>${hibernate.version}</version>
+        <executions>
+          <execution>
+            <id>enhance</id>
+            <goals>
+              <goal>enhance</goal>
+            </goals>
+            <configuration>
+              <enableLazyInitialization>true</enableLazyInitialization>
+              <enableDirtyTracking>true</enableDirtyTracking>
+              <enableAssociationManagement>true</enableAssociationManagement>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+        {%- endif -%}
+      {%- elsif plugin.id == "graphql-code-generation" -%}
+      <plugin>
+        <groupId>io.github.deweyjose</groupId>
+        <artifactId>graphqlcodegen-maven-plugin</artifactId>
+        <version>1.50</version>
+        <executions>
+          <execution>
+            <id>dgs-codegen</id>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <schemaPaths>
+                <param>src/main/resources/graphql-client</param>
+              </schemaPaths>
+              <packageName>{{ metadata.group }}.{{ metadata.artifact }}.codegen</packageName>
+              <addGeneratedAnnotation>true</addGeneratedAnnotation>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-dgs-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-sources</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      {%- elsif plugin.id == "spotless" -%}
+      <!-- Spotless -->
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.42.0</version>
+        <configuration>
+          <formats>
+            <!-- you can define as many formats as you want, each is independent -->
+            <format>
+              <!-- define the files to apply to -->
+              <toggleOffOn>
+                <off>formatter:off</off>
+                <on>formatter:on</on>
+              </toggleOffOn>
+              <includes>
+                <include>.gitattributes</include>
+                <include>.gitignore</include>
+              </includes>
+              <!-- define the steps to apply to those files -->
+              <trimTrailingWhitespace/>
+              <endWithNewline/>
+              <indent>
+                <tabs>false</tabs>
+                <spaces>true</spaces>
+                <spacesPerTab>4</spacesPerTab>
+              </indent>
+            </format>
+          </formats>
+          <!-- define a language-specific format -->
+          {%- if javaSelected -%}
+          <java>
+            <toggleOffOn>
+              <off>formatter:off</off>
+              <on>formatter:on</on>
+            </toggleOffOn>
+            <palantirJavaFormat>
+              <version>2.39.0</version> <!-- optional -->
+              <style>AOSP</style> <!-- or AOSP/GOOGLE (optional) -->
+            </palantirJavaFormat>
+            <removeUnusedImports />
+            <endWithNewline/>
+          </java>
+          {%- else -%}
+          <kotlin>
+            <ktlint>
+              <editorConfigOverride>
+                <indent_size>4</indent_size>
+                <max_line_length>120</max_line_length>
+              </editorConfigOverride>
+            </ktlint>
+            <toggleOffOn>
+              <off>formatter:off</off>
+              <on>formatter:on</on>
+            </toggleOffOn>
+          </kotlin>
+          {%- endif -%}
+          <pom>
+            <!-- These are the defaults, you can override if you want -->
+            <includes>
+              <include>pom.xml</include>
+            </includes>
+            <sortPom></sortPom>
+            </pom>
+        </configuration>
+      </plugin>
+      {%- elsif plugin.id == "sonarqubescanner" -%}
+      <plugin>
+        <groupId>org.sonarsource.scanner.maven</groupId>
+        <artifactId>sonar-maven-plugin</artifactId>
+        <version>3.10.0.2594</version>
+      </plugin>
+      {%- endif -%}
+      {%- endfor -%}
+    </plugins>
+  </build>
 </project>
diff --git a/src/generator/spring/template/readme.md.txt b/src/generator/spring/template/readme.md.txt
index bca5cd9..6f165ea 100644
--- a/src/generator/spring/template/readme.md.txt
+++ b/src/generator/spring/template/readme.md.txt
@@ -27,20 +27,36 @@ You can learn more about the [plugin configuration options](https://netflix.gith
 ## Apply Code format
 ### In *nix based system
 ```sh
+{%- if buildTool == "gradle" -%}
 ./gradlew spotlessApply
+{%- else -%}
+mvn spotless:apply
+{%- endif -%}
 ```
 ### In Windows based system
 ```sh
+{%- if buildTool == "gradle" -%}
 gradlew.bat spotlessApply
+{%- else -%}
+mvn.bat spotless:apply
+{%- endif -%}
 ```
 ## Check for Code format violation
 ### In *nix based system
 ```sh
+{%- if buildTool == "gradle" -%}
 ./gradlew spotlessCheck
+{%- else -%}
+mvn spotless:check
+{%- endif -%}
 ```
 ### In Windows based system
 ```sh
+{%- if buildTool == "gradle" -%}
 gradlew.bat spotlessCheck
+{%- else -%}
+mvn.bat spotless:check
+{%- endif -%}
 ```
 {%- endif -%}