diff --git a/openapi-maven-plugin/.idea/codeStyles/Project.xml b/openapi-maven-plugin/.idea/codeStyles/Project.xml
index 43bf116d..7706aaa2 100644
--- a/openapi-maven-plugin/.idea/codeStyles/Project.xml
+++ b/openapi-maven-plugin/.idea/codeStyles/Project.xml
@@ -59,9 +59,12 @@
       </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
-          <package name="" withSubpackages="true" static="true" />
+          <package name="javax" withSubpackages="true" static="false" />
+          <package name="java" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="true" />
         </value>
       </option>
       <option name="JD_P_AT_EMPTY_LINES" value="false" />
diff --git a/openapi-maven-plugin/config/import-order.txt b/openapi-maven-plugin/config/import-order.txt
new file mode 100644
index 00000000..8a44ea5a
--- /dev/null
+++ b/openapi-maven-plugin/config/import-order.txt
@@ -0,0 +1,4 @@
+0=javax
+1=java
+2=
+3=\#
diff --git a/openapi-maven-plugin/pom.xml b/openapi-maven-plugin/pom.xml
index 6146bba8..f819e8dc 100644
--- a/openapi-maven-plugin/pom.xml
+++ b/openapi-maven-plugin/pom.xml
@@ -253,6 +253,40 @@
       </plugins>
     </pluginManagement>
     <plugins>
+      <!-- Formatter -->
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.43.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>compile</phase>
+          </execution>
+        </executions>
+        <configuration>
+          <java>
+            <!-- These are the defaults, you can override if you want -->
+            <includes>
+              <!--              <include>src/main/java/**/*.java</include>-->
+              <include>src/test/java/**/*.java</include>
+              <!--              <include>src/test/java/io/github/kbuntrock/it/*.java</include>-->
+            </includes>
+            <palantirJavaFormat>
+              <version>2.40.0</version>
+              <style>PALANTIR</style>                       <!-- or  (optional) -->
+              <formatJavadoc>false</formatJavadoc>
+            </palantirJavaFormat>
+            <removeUnusedImports/>
+            <importOrder>
+              <file>config/import-order.txt</file>
+            </importOrder>
+          </java>
+        </configuration>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-toolchains-plugin</artifactId>