diff --git a/.editorconfig b/.editorconfig
index 40c77479cfc..f9326ca027e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,6 +14,10 @@ ij_continuation_indent_size = 8
 indent_style = tab
 max_line_length = off
 ij_continuation_indent_size = 8 # IntelliJ default
+# Imports
+ij_java_imports_layout = java.**, |, javax.**, |, *, |, de.hysky.**, |, $*
+ij_java_class_count_to_use_import_on_demand = 999
+ij_java_names_count_to_use_import_on_demand = 999
 # Wrapping and Braces
 ij_java_keep_simple_blocks_in_one_line = true
 ij_java_keep_simple_classes_in_one_line = true
diff --git a/build.gradle b/build.gradle
index 5e16ab84bd6..e5347a30bc2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -263,6 +263,7 @@ test {
 spotless {
 	java {
 		removeUnusedImports()
+		importOrder('java', 'javax', '', 'de.hysky')
 		//indentWithTabs() // TODO: turn on when more files are converted to tabs
 		trimTrailingWhitespace()
 		endWithNewline()
diff --git a/checkstyle.xml b/checkstyle.xml
index de4bcdbc241..ba063ceabb0 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -24,10 +24,19 @@
         </module>
 
         <!-- Ensure all imports are ship shape -->
+        <module name="AvoidStarImport"/>
         <module name="IllegalImport"/>
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
 
+        <module name="ImportOrder">
+            <property name="groups" value="java,javax,*,de.hysky"/>
+            <property name="ordered" value="true"/>
+            <property name="separated" value="true"/>
+            <property name="option" value="bottom"/> <!-- Put static imports below regular imports -->
+            <property name="sortStaticImportsAlphabetically" value="true"/>
+        </module>
+
         <module name="SeparatorWrap">
             <property name="tokens" value="DOT,ELLIPSIS,AT"/>
             <property name="option" value="nl"/>