diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java
index 4c4880f78..b274c024d 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java
@@ -55,8 +55,9 @@ public abstract class AbstractPersistenceServerServiceTest {
     @MockBean
     protected PDFTronRedactionClient pdfTronRedactionClient;
 
+
     @ClassRule
-    public static PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer("postgres:11.1")
+    public static PostgreSQLContainer postgreSQLContainer = SpringPostgreSQLTestContainer.getInstance()
             .withDatabaseName("integration-tests-db")
             .withUsername("sa")
             .withPassword("sa");
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/SpringPostgreSQLTestContainer.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/SpringPostgreSQLTestContainer.java
new file mode 100644
index 000000000..6c6c7edde
--- /dev/null
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/SpringPostgreSQLTestContainer.java
@@ -0,0 +1,21 @@
+package com.iqser.red.service.peristence.v1.server.integration.utils;
+
+import org.testcontainers.containers.PostgreSQLContainer;
+
+public class SpringPostgreSQLTestContainer extends PostgreSQLContainer<SpringPostgreSQLTestContainer> {
+
+    private static final String IMAGE_VERSION = "postgres:11.1";
+    private static SpringPostgreSQLTestContainer container;
+
+    private SpringPostgreSQLTestContainer() {
+        super(IMAGE_VERSION);
+    }
+
+    public static SpringPostgreSQLTestContainer getInstance() {
+        if (container == null) {
+            container = new SpringPostgreSQLTestContainer();
+        }
+        return container;
+    }
+
+}