diff --git a/pom.xml b/pom.xml
index 71809d2079..49e2e65366 100644
--- a/pom.xml
+++ b/pom.xml
@@ -358,9 +358,10 @@
       <fabric8.version>0.25.0</fabric8.version>
       <mockito.version>1.10.19</mockito.version>
       <postgresql.version>42.2.1</postgresql.version>
-      <postgresql.port>32000</postgresql.port>
+      <postgresql.port>5432</postgresql.port>
       <mysql.version>5.1.40</mysql.version>
       <mysql.port>3306</mysql.port>
+      <database.port>5431</database.port>
 
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 74c462cc15..7e6814cbb0 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -139,7 +139,7 @@
                      <name>postgres:9.4.12</name>
                      <run>
                         <ports>
-                           <port>${postgresql.port}:5432</port>
+                           <port>${database.port}:${postgresql.port}</port>
                         </ports>
                         <env>
                            <POSTGRES_PASSWORD>${alfresco.db.password}</POSTGRES_PASSWORD>
@@ -181,7 +181,7 @@
                <systemPropertyVariables>
                   <db.name>${alfresco.test.db.name}</db.name>
                   <db.driver>org.postgresql.Driver</db.driver>
-                  <db.url>jdbc:postgresql://localhost:${postgresql.port}/${alfresco.test.db.name}</db.url>
+                  <db.url>jdbc:postgresql://localhost:${database.port}/${alfresco.test.db.name}</db.url>
                   <dir.root>${project.build.directory}/alf-data-test</dir.root>
                </systemPropertyVariables>
             </configuration>