diff --git a/pom.xml b/pom.xml
index 9780ef60..fbd65dd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,15 +51,15 @@
         <maven.compiler.target>21</maven.compiler.target>
 
         <!-- Project related -->
-        <spring.rdf.migration.version>1.2.0.RELEASE</spring.rdf.migration.version>
-
+        <spring.rdf.migration.version>2.0.0</spring.rdf.migration.version>
+        <rdf-resolver.version>0.2.0</rdf-resolver.version>
+        
         <!-- Core -->
         <springdoc.version>2.5.0</springdoc.version>
         <postgresql.version>42.7.3</postgresql.version>
         <rdf4j.version>4.3.12</rdf4j.version>
         <jwt.version>0.12.5</jwt.version>
         <lombok.version>1.18.32</lombok.version>
-        <rdf-resolver.version>0.1.2-SNAPSHOT</rdf-resolver.version>
         <hypersistence.version>3.7.6</hypersistence.version>
 
         <!-- Test -->
@@ -76,43 +76,26 @@
         <plugin.spotbugs.version>4.8.5.0</plugin.spotbugs.version>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>central</id>
-            <name>Central Repository</name>
-            <url>https://repo.maven.apache.org/maven2</url>
-            <layout>default</layout>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>nexus-releases</id>
-            <name>Nexus Releases</name>
-            <url>https://nexus.internal.fairdatapoint.org/repository/maven-releases/</url>
-        </repository>
-        <repository>
-            <id>nexus-snapshots</id>
-            <name>Nexus Snapshots</name>
-            <url>https://nexus.internal.fairdatapoint.org/repository/maven-snapshots/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
 
         <!-- ////////////////// -->
         <!--   Project related  -->
         <!-- ////////////////// -->
         <dependency>
-            <groupId>nl.dtls</groupId>
+            <groupId>org.fairdatateam.rdf</groupId>
             <artifactId>spring-rdf-migration</artifactId>
             <version>${spring.rdf.migration.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.fairdatateam.rdf</groupId>
+            <artifactId>rdf-resource-resolver-core</artifactId>
+            <version>${rdf-resolver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.fairdatateam.rdf</groupId>
+            <artifactId>rdf-resource-resolver-api</artifactId>
+            <version>${rdf-resolver.version}</version>
+        </dependency>
 
         <!-- ////////////////// -->
         <!--   Spring           -->
@@ -212,16 +195,6 @@
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.github.fairdevkit</groupId>
-            <artifactId>rdf-resource-resolver-core</artifactId>
-            <version>${rdf-resolver.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.fairdevkit</groupId>
-            <artifactId>rdf-resource-resolver-api</artifactId>
-            <version>${rdf-resolver.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
diff --git a/src/main/java/org/fairdatapoint/config/RepositoryMigrationConfig.java b/src/main/java/org/fairdatapoint/config/RepositoryMigrationConfig.java
index b1863fa3..9c7f96a3 100644
--- a/src/main/java/org/fairdatapoint/config/RepositoryMigrationConfig.java
+++ b/src/main/java/org/fairdatapoint/config/RepositoryMigrationConfig.java
@@ -23,8 +23,8 @@
 package org.fairdatapoint.config;
 
 import org.fairdatapoint.Profiles;
-import nl.dtls.rdf.migration.database.RdfMigrationRepository;
-import nl.dtls.rdf.migration.runner.RdfProductionMigrationRunner;
+import org.fairdatateam.rdf.migration.database.RdfMigrationRepository;
+import org.fairdatateam.rdf.migration.runner.RdfProductionMigrationRunner;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java
index 54e190be..e2313a4e 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0001_Init.java
@@ -24,8 +24,8 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.fairdatapoint.service.reset.FactoryDefaults;
-import nl.dtls.rdf.migration.entity.RdfMigrationAnnotation;
-import nl.dtls.rdf.migration.runner.RdfProductionMigration;
+import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation;
+import org.fairdatateam.rdf.migration.runner.RdfProductionMigration;
 import org.bson.Document;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Statement;
diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java
index ff5b08b0..908cd5f5 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0002_Metadata_Draft.java
@@ -23,8 +23,8 @@
 package org.fairdatapoint.database.rdf.migration.production;
 
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.rdf.migration.entity.RdfMigrationAnnotation;
-import nl.dtls.rdf.migration.runner.RdfProductionMigration;
+import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation;
+import org.fairdatateam.rdf.migration.runner.RdfProductionMigration;
 import org.springframework.stereotype.Service;
 
 @RdfMigrationAnnotation(
diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java
index e610a82c..1e7bca1b 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0003_FDPO.java
@@ -23,8 +23,8 @@
 package org.fairdatapoint.database.rdf.migration.production;
 
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.rdf.migration.entity.RdfMigrationAnnotation;
-import nl.dtls.rdf.migration.runner.RdfProductionMigration;
+import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation;
+import org.fairdatateam.rdf.migration.runner.RdfProductionMigration;
 import org.springframework.stereotype.Service;
 
 @RdfMigrationAnnotation(
diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java
index 7c258d81..b9635c9c 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0004_Cleanup_Index.java
@@ -23,8 +23,8 @@
 package org.fairdatapoint.database.rdf.migration.production;
 
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.rdf.migration.entity.RdfMigrationAnnotation;
-import nl.dtls.rdf.migration.runner.RdfProductionMigration;
+import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation;
+import org.fairdatateam.rdf.migration.runner.RdfProductionMigration;
 import org.springframework.stereotype.Service;
 
 @RdfMigrationAnnotation(
diff --git a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java
index 77fb9459..f6ef3d14 100644
--- a/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java
+++ b/src/main/java/org/fairdatapoint/database/rdf/migration/production/Rdf_Migration_0005_FixMetadataVersion.java
@@ -23,8 +23,8 @@
 package org.fairdatapoint.database.rdf.migration.production;
 
 import lombok.extern.slf4j.Slf4j;
-import nl.dtls.rdf.migration.entity.RdfMigrationAnnotation;
-import nl.dtls.rdf.migration.runner.RdfProductionMigration;
+import org.fairdatateam.rdf.migration.entity.RdfMigrationAnnotation;
+import org.fairdatateam.rdf.migration.runner.RdfProductionMigration;
 import org.springframework.stereotype.Service;
 
 @RdfMigrationAnnotation(
diff --git a/src/main/java/org/fairdatapoint/service/label/LabelService.java b/src/main/java/org/fairdatapoint/service/label/LabelService.java
index 2872727a..874227b0 100644
--- a/src/main/java/org/fairdatapoint/service/label/LabelService.java
+++ b/src/main/java/org/fairdatapoint/service/label/LabelService.java
@@ -25,10 +25,10 @@
 import static java.util.function.Predicate.isEqual;
 import static org.fairdatapoint.config.CacheConfig.LABEL_CACHE;
 import static org.fairdatapoint.util.ValueFactoryHelper.i;
-import com.github.fairdevkit.rdf.resolver.api.ResourceResolver;
-import com.github.fairdevkit.rdf.resolver.core.ContentNegotiationStrategy;
-import com.github.fairdevkit.rdf.resolver.core.CoreResourceResolver;
-import com.github.fairdevkit.rdf.resolver.core.PathExtensionStrategy;
+import org.fairdatateam.rdf.resolver.api.ResourceResolver;
+import org.fairdatateam.rdf.resolver.core.ContentNegotiationStrategy;
+import org.fairdatateam.rdf.resolver.core.CoreResourceResolver;
+import org.fairdatateam.rdf.resolver.core.PathExtensionStrategy;
 import java.util.Optional;
 
 import lombok.extern.slf4j.Slf4j;