diff --git a/openfasttrace-mc-deployable-parent/pom.xml b/openfasttrace-mc-deployable-parent/pom.xml
index eb887381..bb858757 100644
--- a/openfasttrace-mc-deployable-parent/pom.xml
+++ b/openfasttrace-mc-deployable-parent/pom.xml
@@ -56,30 +56,8 @@ It is maintained separately from the main parent POM for the following reasons:
                             </execution>
                         </executions>
                     </plugin>
-                    <!-- This plugin needs to be skipped when using the central-publishing-maven-plugin
- -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <version>3.1.4</version>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
     </profiles>
-    <distributionManagement>
-        <repository>
-            <id>central</id>
-            <name>Maven Central</name>
-            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-        <snapshotRepository>
-            <id>central</id>
-            <name>Maven Central Snapshots</name>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
 </project>
diff --git a/parent/pom.xml b/parent/pom.xml
index 99289099..86f0b7f7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -432,6 +432,10 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.7.0</version>
+                <configuration>
+                    <flattenMode>oss</flattenMode> <!-- Use 'oss' mode for Maven Central -->
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -582,6 +586,16 @@
                         </execution>
                     </executions>
                 </plugin>
+                <!-- The maven-deploy-plugin MUST be disabled when using the central-publishing-maven-plugin!
+-->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <!-- The version does not really matter if all we want is disabling the plugin -->
+                    <configuration>
+                        <skip>true</skip>
+                    </configuration>
+                </plugin>
                 <!--This
                 plugin's configuration is used to store Eclipse 
                     m2e settings only. It has no influence on the Maven build itself. -->
@@ -669,16 +683,7 @@
             </plugin>
         </plugins>
     </reporting>
-    <distributionManagement>
-        <repository>
-            <id>central</id>
-            <name>Maven Central</name>
-            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-        <snapshotRepository>
-            <id>central</id>
-            <name>Maven Central Snapshots</name>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
+    <!-- With the central-publishing-plugin, the distribution management section
+    is now obsolete, since the only place this plugin can deploy to is Maven
+    central anyway. -->
 </project>
diff --git a/pom.xml b/pom.xml
index c65abd92..6c8094b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,16 +35,4 @@
         <module>reporter/aspec</module>
         <module>testutil</module>
     </modules>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>3.1.4</version>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/testutil/pom.xml b/testutil/pom.xml
index ddcba456..9f5f12f3 100644
--- a/testutil/pom.xml
+++ b/testutil/pom.xml
@@ -73,29 +73,6 @@
                     <useModulePath>false</useModulePath>
                 </configuration>
             </plugin>
-            <!-- Skip everything that has to do with deployment to Maven Central -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.central</groupId>
-                <artifactId>central-publishing-maven-plugin</artifactId>
-                <configuration>
-                    <autoPublish>false</autoPublish>
-                    <skipPublishing>true</skipPublishing>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>