diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e0e4c96..512eb79 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,8 +32,6 @@ jobs:
           distribution: 'zulu'
       - name: Check format
         run: mvn spotless:check
-      - name: Check Sort POM
-        run: mvn sortpom:verify
 
   test_ingester_common:
     needs: check
diff --git a/pom.xml b/pom.xml
index e40c90b..5158e56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,6 @@
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
         <palantir-java-format.version>2.41.0</palantir-java-format.version>
-        <sortpom-maven-plugin.version>3.4.1</sortpom-maven-plugin.version>
         <spotless-plugin.version>2.43.0</spotless-plugin.version>
     </properties>
 
@@ -199,23 +198,27 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>com.github.ekryd.sortpom</groupId>
-                <artifactId>sortpom-maven-plugin</artifactId>
-                <version>${sortpom-maven-plugin.version}</version>
-                <configuration>
-                    <nrOfIndentSpace>4</nrOfIndentSpace>
-                    <keepBlankLines>true</keepBlankLines>
-                    <expandEmptyElements>false</expandEmptyElements>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                    <verifyFail>Stop</verifyFail>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
                 <version>${spotless-plugin.version}</version>
                 <configuration>
+                    <formats>
+                        <format>
+                            <includes>
+                                <include>*.md</include>
+                                <include>.gitignore</include>
+                                <include>pom.xml</include>
+                            </includes>
+                            <trimTrailingWhitespace />
+                            <endWithNewline />
+                            <indent>
+                                <spaces>true</spaces>
+                                <spacesPerTab>4</spacesPerTab>
+                            </indent>
+                        </format>
+                    </formats>
+
                     <java>
                         <palantirJavaFormat>
                             <version>${palantir-java-format.version}</version>
@@ -233,6 +236,14 @@
                         </indent>
                         <toggleOffOn/>
                     </java>
+
+                    <pom>
+                        <sortPom>
+                            <expandEmptyElements>false</expandEmptyElements>
+                            <keepBlankLines>true</keepBlankLines>
+                            <nrOfIndentSpace>4</nrOfIndentSpace>
+                        </sortPom>
+                    </pom>
                 </configuration>
             </plugin>