diff --git a/pom.xml b/pom.xml
index 1b2fd2e26..22f938e04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -595,86 +595,52 @@
     </profile>
 
     <profile>
+      <!-- cloud RAD generation -->
       <id>docFX</id>
       <activation>
         <property>
-          <!-- Activate with -P docFX -->
+          <!-- activate with -P docFX -->
           <name>docFX</name>
         </property>
       </activation>
-      <reporting>
+      <properties>
+        <!-- default config values -->
+        <docletName>java-docfx-doclet-1.3.0</docletName>
+        <outputpath>${project.build.directory}/docfx-yml</outputpath>
+        <projectname>${project.artifactId}</projectname>
+        <excludeclasses></excludeclasses>
+        <excludePackages></excludePackages>
+        <source>7</source>            
+        <sourceFileExclude></sourceFileExclude>
+      </properties>
+      <build>
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <version>3.3.1</version>
-            <reportSets>
-              <reportSet>
-                <id>docFX</id>
-                <reports>
-                  <report>javadoc</report>
-                  <report>aggregate</report>
-                  <report>aggregate-jar</report>
-                </reports>
-              </reportSet>
-            </reportSets>
             <configuration>
               <doclet>com.microsoft.doclet.DocFxDoclet</doclet>
               <useStandardDocletOptions>false</useStandardDocletOptions>
-              <docletPath>${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.3.0.jar</docletPath>
-              <additionalOptions>-outputpath ${project.build.directory}/docfx-yml -projectname ${artifactId}</additionalOptions>
+               <!-- custom config with -Dproperty=value -->
+              <docletPath>${env.KOKORO_GFILE_DIR}/${docletName}.jar</docletPath>
+              <additionalOptions>
+                -outputpath ${outputpath} 
+                -projectname ${projectname} 
+                -excludeclasses ${excludeclasses}: 
+                -excludepackages ${excludePackages}:
+              </additionalOptions>
               <doclint>none</doclint>
               <show>protected</show>
               <nohelp>true</nohelp>
-              <source>7</source>
-              <groups>
-                <group>
-                  <title>google-api-client</title>
-                  <packages>com.google.api.client.googleapis*</packages>
-                </group>
-                <group>
-                  <title>google-api-client-android</title>
-                  <packages>com.google.api.client.googleapis.extensions.android.*</packages>
-                </group>
-                <group>
-                  <title>google-api-client-appengine</title>
-                  <packages>com.google.api.client.googleapis.extensions.appengine*</packages>
-                </group>
-                <group>
-                  <title>google-api-client-gson</title>
-                  <packages>com.google.api.client.googleapis.notifications.json.gson.*</packages>
-                </group>
-                <group>
-                  <title>google-api-client-jackson2</title>
-                  <packages>com.google.api.client.googleapis.notifications.json.jackson2.*</packages>
-                </group>
-                <group>
-                  <title>google-api-client-java6</title>
-                  <packages>com.google.api.client.googleapis.extensions.java6.*</packages>
-                </group>
-                <group>
-                  <title>google-api-client-protobuf</title>
-                  <packages>com.google.api.client.googleapis.services.protobuf*:com.google.api.client.googleapis.testing.services.protobuf*</packages>
-                </group>
-                <group>
-                  <title>google-api-client-servlet</title>
-                  <packages>com.google.api.client.googleapis.extensions.servlet*</packages>
-                </group>
-                <group>
-                  <title>google-api-client-xml</title>
-                  <packages>com.google.api.client.googleapis.xml.*</packages>
-                </group>
-              </groups>
-              <links>
-                <link>http://download.oracle.com/javase/7/docs/api/</link>
-                <link>http://cloud.google.com/appengine/docs/java/javadoc</link>
-                <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
-                <link>https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/</link>
-              </links>
+              <source>${source}</source>
+              <sourceFileExcludes>
+                <exclude>${sourceFileExclude}</exclude>
+              </sourceFileExcludes>
             </configuration>
           </plugin>
         </plugins>
-      </reporting>
+      </build>
     </profile>
   </profiles>
 </project>