diff --git a/src/main/java/org/gcube/gcat/configuration/isproxies/impl/FacetBasedISConfigurationProxy.java b/src/main/java/org/gcube/gcat/configuration/isproxies/impl/FacetBasedISConfigurationProxy.java
index 25b915f..a14d652 100644
--- a/src/main/java/org/gcube/gcat/configuration/isproxies/impl/FacetBasedISConfigurationProxy.java
+++ b/src/main/java/org/gcube/gcat/configuration/isproxies/impl/FacetBasedISConfigurationProxy.java
@@ -93,7 +93,7 @@ public class FacetBasedISConfigurationProxy extends ISConfigurationProxy<SimpleF
 	}
 	
 	protected File getBaseDirectory(String directoryName) {
-		URL directoryURL = ClassLoader.getSystemClassLoader().getResource(directoryName);
+		URL directoryURL = this.getClass().getClassLoader().getResource(directoryName);
 		File directory = new File(directoryURL.getPath());
 		return directory;
 	}
diff --git a/src/main/java/org/gcube/gcat/utils/Constants.java b/src/main/java/org/gcube/gcat/utils/Constants.java
index 28161e7..59b2a20 100644
--- a/src/main/java/org/gcube/gcat/utils/Constants.java
+++ b/src/main/java/org/gcube/gcat/utils/Constants.java
@@ -31,7 +31,7 @@ public class Constants {
 		try {
 			if(clientSecret==null) {
 				Properties properties = new Properties();
-				URL url = ClassLoader.getSystemClassLoader().getResource(CLIENT_SECRET_FILENAME);
+				URL url = Constants.class.getClassLoader().getResource(CLIENT_SECRET_FILENAME);
 				logger.trace("Going to read {} at {}", CLIENT_SECRET_FILENAME, url.toString());
 				InputStream input = ClassLoader.getSystemClassLoader().getResourceAsStream(CLIENT_SECRET_FILENAME);
 				properties.load(input);