diff --git a/maven-modules/maven-plugins/pom.xml b/maven-modules/maven-plugins/pom.xml
index 9a52fe943eb5..aed6f3328af9 100644
--- a/maven-modules/maven-plugins/pom.xml
+++ b/maven-modules/maven-plugins/pom.xml
@@ -21,6 +21,7 @@
         <module>jaxws</module>
         <module>spotless</module>
         <module>external-properties-file</module>
+        <module>spring-properties-cleaner</module>
     </modules>
 
     <build>
diff --git a/maven-modules/maven-plugins/spring-properties-cleaner/pom.xml b/maven-modules/maven-plugins/spring-properties-cleaner/pom.xml
new file mode 100644
index 000000000000..239b58c56ad0
--- /dev/null
+++ b/maven-modules/maven-plugins/spring-properties-cleaner/pom.xml
@@ -0,0 +1,63 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-properties-cleaner</artifactId>
+
+    <parent>
+        <artifactId>maven-plugins</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>uk.org.webcompere</groupId>
+                <artifactId>spring-properties-cleaner-plugin</artifactId>
+                <version>1.0.6</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>scan</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!-- final configuration that protects these properties files - comment these all out and bring in the properties
+                    from "original-unfixed" to follow the steps from the example -->
+                    <sort>clustered</sort>
+                    <inlinePrefix>https?://</inlinePrefix>
+                    <common>full</common>
+                    <whitespace>section</whitespace>
+                </configuration>
+            </plugin>
+
+            <!-- the configuration below in not needed for this tutorial or for Spotless,
+                but we need it when building all the modules in our Jenkins CI  -->
+            <plugin>
+                <artifactId>maven-verifier-plugin</artifactId>
+                <version>${maven.verifier.version}</version>
+                <configuration>
+                    <verificationFile>../input-resources/verifications.xml</verificationFile>
+                    <failOnError>false</failOnError>
+                </configuration>
+            </plugin>
+        </plugins>
+
+        <!-- in a spring project it will default to src/main/resources -->
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+
+    <properties>
+    </properties>
+
+</project>
diff --git a/maven-modules/maven-plugins/spring-properties-cleaner/src/main/resources/application-dev.properties b/maven-modules/maven-plugins/spring-properties-cleaner/src/main/resources/application-dev.properties
new file mode 100644
index 000000000000..d102d677122d
--- /dev/null
+++ b/maven-modules/maven-plugins/spring-properties-cleaner/src/main/resources/application-dev.properties
@@ -0,0 +1,6 @@
+spring.redis.timeout=10000
+spring.jpa.show-sql=true
+
+redis_host=http://localhost
+
+upstream.host=http://myapp.dev.myorg.com
\ No newline at end of file
diff --git a/maven-modules/maven-plugins/spring-properties-cleaner/src/main/resources/application-prod.properties b/maven-modules/maven-plugins/spring-properties-cleaner/src/main/resources/application-prod.properties
new file mode 100644
index 000000000000..a608a8da4367
--- /dev/null
+++ b/maven-modules/maven-plugins/spring-properties-cleaner/src/main/resources/application-prod.properties
@@ -0,0 +1,5 @@
+spring.redis.timeout=2000
+
+upstream.host=https://myapp.prod.myorg.com
+
+redis_host=https://azure.redis6a5d54.microsoft.com
\ No newline at end of file
diff --git a/maven-modules/maven-plugins/spring-properties-cleaner/src/main/resources/application.properties b/maven-modules/maven-plugins/spring-properties-cleaner/src/main/resources/application.properties
new file mode 100644
index 000000000000..e6e891075943
--- /dev/null
+++ b/maven-modules/maven-plugins/spring-properties-cleaner/src/main/resources/application.properties
@@ -0,0 +1,9 @@
+spring.datasource.url=jdbc:postgresql://${db_server}/mydatabase
+spring.datasource.username=${USERNAME}
+spring.datasource.password=${PASSWORD}
+spring.redis.host=${redis_host}
+spring.redis.port=6379
+
+# upstream services
+upstream.service.users.url=${upstream.host}/api/users
+upstream.service.products.url=${upstream.host}/api/products
\ No newline at end of file
diff --git a/maven-modules/maven-plugins/spring-properties-cleaner/src/main/resources/original-unfixed/application-dev.properties b/maven-modules/maven-plugins/spring-properties-cleaner/src/main/resources/original-unfixed/application-dev.properties
new file mode 100644
index 000000000000..2bb6064bcbe1
--- /dev/null
+++ b/maven-modules/maven-plugins/spring-properties-cleaner/src/main/resources/original-unfixed/application-dev.properties
@@ -0,0 +1,21 @@
+spring.datasource.url=jdbc:postgresql://${db_server}/mydatabase
+spring.datasource.username=${USERNAME}
+spring.datasource.password = ${PASSWORD}
+
+redis_host=localhost
+
+spring.redis.host=http://${redis_host}
+spring.redis.port=6379
+
+redis_host=localhost
+
+spring.jpa.show-sql=true
+
+
+upstream.host = myapp.dev.myorg.com
+
+# upstream services
+upstream.service.users.url=http://${upstream.host}/api/users
+upstream.service.products.url=http://${upstream.host}/api/products
+
+spring.redis.timeout=10000
\ No newline at end of file
diff --git a/maven-modules/maven-plugins/spring-properties-cleaner/src/main/resources/original-unfixed/application-prod.properties b/maven-modules/maven-plugins/spring-properties-cleaner/src/main/resources/original-unfixed/application-prod.properties
new file mode 100644
index 000000000000..80436729df26
--- /dev/null
+++ b/maven-modules/maven-plugins/spring-properties-cleaner/src/main/resources/original-unfixed/application-prod.properties
@@ -0,0 +1,16 @@
+spring.datasource.url=jdbc:postgresql://${db_server}/mydatabase
+spring.datasource.username=${USERNAME}
+spring.datasource.password = ${PASSWORD}
+
+# upstream services
+upstream.service.users.url=https://${upstream.host}/api/users
+upstream.service.products.url=https://${upstream.host}/api/products
+
+redis_host=azure.redis6a5d54.microsoft.com
+
+spring.redis.host=https://${redis_host}
+spring.redis.port=6379
+
+upstream.host = myapp.prod.myorg.com
+
+spring.redis.timeout=2000
\ No newline at end of file