diff --git a/pom.xml b/pom.xml
index 9924ba73..11ab9d20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,6 +160,14 @@
     <netty.version>4.1.78.Final</netty.version>
     <mockserver-client-java.version>5.11.2</mockserver-client-java.version>
     <generate-marc-utils-version>1.5.0</generate-marc-utils-version>
+    <postgres.docker.env.POSTGRES_DB>localhost</postgres.docker.env.POSTGRES_DB>
+    <postgres.docker.envRun.POSTGRES_PASSWORD>postgres</postgres.docker.envRun.POSTGRES_PASSWORD>
+    <postgres.docker.envRun.POSTGRES_USER>postgres</postgres.docker.envRun.POSTGRES_USER>
+    <postgres.docker.log.prefix>postgres</postgres.docker.log.prefix>
+    <postgres.docker.name>postgres:12.0</postgres.docker.name>
+    <postgres.docker.ports.1>+pg.ip:pg.port:5432</postgres.docker.ports.1>
+    <postgres.docker.wait.log>PostgreSQL init process complete</postgres.docker.wait.log>
+    <postgres.docker.wait.time>60000</postgres.docker.wait.time>
   </properties>
 
   <dependencies>
@@ -720,26 +728,38 @@
       </plugin>
 
       <plugin>
-        <groupId>com.gitlab.janecekpetr</groupId>
-        <artifactId>embedded-postgresql-maven-plugin</artifactId>
-        <version>0.1.0</version>
+        <groupId>io.fabric8</groupId>
+        <artifactId>docker-maven-plugin</artifactId>
+        <version>0.42.0</version>
         <configuration>
-          <pgServerPort>15432</pgServerPort>
-          <dbName>postgres</dbName>
-          <userName>postgres</userName>
-          <password>postgres</password>
+          <containerNamePattern>pg-mod-oai-pmh-generate-%i</containerNamePattern>
+          <images>
+            <image>
+              <external>
+                <type>properties</type>
+                <prefix>postgres.docker</prefix>
+              </external>
+            </image>
+          </images>
         </configuration>
         <executions>
           <execution>
-            <id>start-pgsql</id>
-            <phase>initialize</phase>
+            <id>stop-previous-database</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>prepare-database</id>
+            <phase>generate-sources</phase>
             <goals>
               <goal>start</goal>
             </goals>
           </execution>
           <execution>
-            <id>stop-pgsql</id>
-            <phase>compile</phase>
+            <id>stop-database</id>
+            <phase>process-sources</phase>
             <goals>
               <goal>stop</goal>
             </goals>
@@ -754,7 +774,7 @@
         <configuration>
           <changeLogFile>src/main/resources/liquibase/tenant/changelog.xml</changeLogFile>
           <driver>org.postgresql.Driver</driver>
-          <url>jdbc:postgresql://localhost:15432/postgres</url>
+          <url>jdbc:postgresql://${pg.ip}:${pg.port}/postgres</url>
           <username>postgres</username>
           <password>postgres</password>
         </configuration>
@@ -809,7 +829,7 @@
         <configuration>
           <jdbc>
             <driver>org.postgresql.Driver</driver>
-            <url>jdbc:postgresql://localhost:15432/postgres</url>
+            <url>jdbc:postgresql://${pg.ip}:${pg.port}/postgres</url>
             <user>postgres</user>
             <password>postgres</password>
           </jdbc>