diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 28be9f9c..ba39db70 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,4 +1,4 @@
 ## Changelog for v2.1.3
 
 - Clean the poms + remove usused module process
-- Fix Sonatype publishing
\ No newline at end of file
+- Fix Sonatype deploy
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f01ce420..d829dbb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,14 @@
         <tag>HEAD</tag>
     </scm>
 
+    <!-- Snapshots are uploaded by the standard maven-deploy-plugin to the Central snapshot repository -->
+    <distributionManagement>
+        <snapshotRepository>
+            <id>sonatype</id>
+            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
     <issueManagement>
         <system>Github</system>
         <url>https://github.com/orbisgis/orbisdata/issues</url>
@@ -255,6 +263,19 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
                     </plugin>
+                    <!-- Release publishing: the extension bundles all the artifacts and uploads them to the Central Portal.
+                         It must only be enabled for releases: when active it also takes over the deploy of snapshots, which then fail. -->
+                    <plugin>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
+                        <version>0.12.0</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <publishingServerId>sonatype</publishingServerId>
+                            <autoPublish>true</autoPublish>
+                            <waitUntil>published</waitUntil>
+                        </configuration>
+                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -488,15 +509,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.sonatype.central</groupId>
-                <artifactId>central-publishing-maven-plugin</artifactId>
-                <version>0.12.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <publishingServerId>sonatype</publishingServerId>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file