diff --git a/hadoop-hdds/client/pom.xml b/hadoop-hdds/client/pom.xml
index bbcf366bf6bc..917d90f88e86 100644
--- a/hadoop-hdds/client/pom.xml
+++ b/hadoop-hdds/client/pom.xml
@@ -110,16 +110,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>com.coderplus.maven.plugins</groupId>
-        <artifactId>copy-rename-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>rename-generated-config</id>
-            <phase>process-classes</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml
index 45f10c674317..50094356f7b5 100644
--- a/hadoop-hdds/common/pom.xml
+++ b/hadoop-hdds/common/pom.xml
@@ -262,20 +262,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>com.coderplus.maven.plugins</groupId>
-        <artifactId>copy-rename-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>rename-generated-config</id>
-            <phase>process-classes</phase>
-          </execution>
-          <execution>
-            <id>rename-generated-test-config</id>
-            <phase>process-test-classes</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml
index 47ccda8baf8b..45e32b47db23 100644
--- a/hadoop-hdds/config/pom.xml
+++ b/hadoop-hdds/config/pom.xml
@@ -70,6 +70,9 @@
               <annotationProcessors>
                 <annotationProcessor>org.apache.hadoop.hdds.conf.ConfigFileGenerator</annotationProcessor>
               </annotationProcessors>
+              <compilerArgs>
+                <arg>-AartifactId=</arg>
+              </compilerArgs>
             </configuration>
           </execution>
         </executions>
diff --git a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java
index 372d75753b63..be07fddb3102 100644
--- a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java
+++ b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java
@@ -49,7 +49,8 @@
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 public class ConfigFileGenerator extends AbstractProcessor {
 
-  public static final String OUTPUT_FILE_NAME = "ozone-default-generated.xml";
+  private static final String OUTPUT_FILE_NAME = "ozone-default-generated.xml";
+  private static final String OUTPUT_FILE_POSTFIX = "-default.xml";
 
   private static final SimpleTypeVisitor8<Element, Void> GET_PARENT_ELEMENT =
       new SimpleTypeVisitor8<Element, Void>() {
@@ -73,9 +74,16 @@ public boolean process(Set<? extends TypeElement> annotations,
       //load existing generated config (if exists)
       boolean resourceExists = true;
       ConfigFileAppender appender = new ConfigFileAppender();
+      String currentArtifactId = processingEnv.getOptions().get("artifactId");
+      String outputFileName;
+      if (currentArtifactId == null || currentArtifactId.isEmpty()) {
+        outputFileName = OUTPUT_FILE_NAME;
+      } else {
+        outputFileName = currentArtifactId + OUTPUT_FILE_POSTFIX;
+      }
       try (InputStream input = filer
           .getResource(StandardLocation.CLASS_OUTPUT, "",
-              OUTPUT_FILE_NAME).openInputStream()) {
+              outputFileName).openInputStream()) {
         appender.load(input);
       } catch (FileNotFoundException | NoSuchFileException ex) {
         appender.init();
@@ -110,7 +118,7 @@ public boolean process(Set<? extends TypeElement> annotations,
       if (!resourceExists) {
         FileObject resource = filer
             .createResource(StandardLocation.CLASS_OUTPUT, "",
-                OUTPUT_FILE_NAME);
+                outputFileName);
 
         try (Writer writer = new OutputStreamWriter(
             resource.openOutputStream(), StandardCharsets.UTF_8)) {
diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml
index fde6e8c7898a..2c5314068fd6 100644
--- a/hadoop-hdds/container-service/pom.xml
+++ b/hadoop-hdds/container-service/pom.xml
@@ -263,16 +263,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>com.coderplus.maven.plugins</groupId>
-        <artifactId>copy-rename-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>rename-generated-config</id>
-            <phase>process-classes</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml
index 782d8b6fce87..2f4d3a58b389 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -332,20 +332,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>com.coderplus.maven.plugins</groupId>
-        <artifactId>copy-rename-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>rename-generated-config</id>
-            <phase>process-classes</phase>
-          </execution>
-          <execution>
-            <id>rename-generated-test-config</id>
-            <phase>process-test-classes</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index 7f9db0c04d08..4761fcd722a8 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -241,16 +241,6 @@
       </testResource>
     </testResources>
     <plugins>
-      <plugin>
-        <groupId>com.coderplus.maven.plugins</groupId>
-        <artifactId>copy-rename-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>rename-generated-config</id>
-            <phase>process-classes</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index 0f91ba21d9a5..cb082b9d6c44 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -187,16 +187,6 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <groupId>com.coderplus.maven.plugins</groupId>
-        <artifactId>copy-rename-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>rename-generated-config</id>
-            <phase>process-classes</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-maven-plugins</artifactId>
diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml
index eb8c3b6fa9a1..6dac6cb42db0 100644
--- a/hadoop-ozone/csi/pom.xml
+++ b/hadoop-ozone/csi/pom.xml
@@ -194,16 +194,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>com.coderplus.maven.plugins</groupId>
-        <artifactId>copy-rename-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>rename-generated-config</id>
-            <phase>process-classes</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>com.salesforce.servicelibs</groupId>
         <artifactId>proto-backwards-compatibility</artifactId>
diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index d2dcdb9d6578..cfe37bba1b8a 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -383,16 +383,6 @@
       </testResource>
     </testResources>
     <plugins>
-      <plugin>
-        <groupId>com.coderplus.maven.plugins</groupId>
-        <artifactId>copy-rename-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>rename-generated-config</id>
-            <phase>process-classes</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index df5d4527f2df..42be97ed1983 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -326,16 +326,6 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <groupId>com.coderplus.maven.plugins</groupId>
-        <artifactId>copy-rename-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>rename-generated-config</id>
-            <phase>process-classes</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 837522f95b0f..0341797c945c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1804,6 +1804,9 @@
           <version>${maven-compiler-plugin.version}</version>
           <configuration>
             <useIncrementalCompilation>false</useIncrementalCompilation>
+            <compilerArgs>
+              <arg>-AartifactId=${project.artifactId}</arg>
+            </compilerArgs>
           </configuration>
         </plugin>
         <plugin>
@@ -2170,53 +2173,6 @@
             <includeTests>true</includeTests>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>com.coderplus.maven.plugins</groupId>
-          <artifactId>copy-rename-maven-plugin</artifactId>
-          <version>${copy-rename-maven-plugin.version}</version>
-          <executions>
-            <!--
-              If a new module is introduced with generated config:
-              - override ban-annotations execution of maven-enforcer-plugin
-              - configure maven-compiler-plugin with the ConfigFileGenerator annotationProcessor
-              - bind one or both of these rename executions
-              - add the module's name in OzoneConfiguration#activate
-              See hadoop-hdds/common/pom.xml for example.
-            -->
-            <execution>
-              <id>rename-generated-config</id>
-              <goals>
-                <goal>rename</goal>
-              </goals>
-              <!-- bind to process-classes in modules where needed -->
-              <phase>none</phase>
-              <configuration>
-                <fileSets>
-                  <fileSet>
-                    <sourceFile>${project.build.outputDirectory}/ozone-default-generated.xml</sourceFile>
-                    <destinationFile>${project.build.outputDirectory}/${project.artifactId}-default.xml</destinationFile>
-                  </fileSet>
-                </fileSets>
-              </configuration>
-            </execution>
-            <execution>
-              <id>rename-generated-test-config</id>
-              <goals>
-                <goal>rename</goal>
-              </goals>
-              <!-- bind to process-test-classes in modules where needed -->
-              <phase>none</phase>
-              <configuration>
-                <fileSets>
-                  <fileSet>
-                    <sourceFile>${project.build.testOutputDirectory}/ozone-default-generated.xml</sourceFile>
-                    <destinationFile>${project.build.testOutputDirectory}/${project.artifactId}-default.xml</destinationFile>
-                  </fileSet>
-                </fileSets>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
       </plugins>
     </pluginManagement>