diff --git a/.gitignore b/.gitignore
index 271e5e1..40899f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 target
 .classpath
 .project
-/.DS_Store
+**/.DS_Store
 /bin/
diff --git a/pom.xml b/pom.xml
index 8a2f988..aa43881 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,8 +28,8 @@
 		<dependencies>
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
-				<artifactId>gcube-smartgears-bom</artifactId>
-				<version>2.5.0-SNAPSHOT</version>
+				<artifactId>gcube-bom</artifactId>
+				<version>2.4.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -81,6 +81,19 @@
 			<type>war</type>
 		</dependency>
 		
+				<!-- Added to support Java 11 JDK -->
+		<dependency>
+    		<groupId>javax.xml.ws</groupId>
+    		<artifactId>jaxws-api</artifactId>
+    		<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<!-- END Added to support Java 11 JDK -->
+		
 		<!-- Test Dependency -->
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java
index 93f7467..4cb6165 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java
@@ -27,7 +27,7 @@ public class ContextTest {
 	
 	private static final Logger logger = LoggerFactory.getLogger(ContextTest.class);
 	
-	protected static final String CONFIG_INI_FILENAME = "config.properties";
+	protected static final String CONFIG_INI_FILENAME = "config.ini";
 	
 	public static final String ROOT_DEV;
 	public static final String ROOT_PREPROD;
@@ -140,7 +140,7 @@ public class ContextTest {
 	
 	@BeforeClass
 	public static void beforeClass() throws Exception {
-		setContextByName(ROOT_DEV);
+		setContextByName(ROOT_PREPROD);
 	}
 	
 	@AfterClass
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java b/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java
index 905394f..91cc745 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java
@@ -24,16 +24,16 @@ public class DataBaseCreator extends ContextTest {
 	
 	@Test
 	public void createDatabase() throws Exception {
-		ContextTest.setContextByName(ROOT_DEV);
+		ContextTest.setContextByName(ROOT_PREPROD);
 		logger.debug("Going to create DB");
 		String db = DatabaseEnvironment.DB_URI;
 		logger.debug("{} created", db);
 	}
 	
-	@Ignore
+	// @Ignore
 	@Test
 	public void createAllContexts() throws Exception {
-		ContextTest.setContextByName(ROOT_DEV);
+		ContextTest.setContextByName(ROOT_PREPROD);
 		ContextCreator contextCreator = new ContextCreator();
 		contextCreator.all();
 	}