diff --git a/config/sync/field.storage.rdf_entity.field_isr_solution_type.yml b/config/sync/field.storage.rdf_entity.field_isr_solution_type.yml
index 281563012001483eba45cfb171aa4ea7d65bb26a..a93ea44fcd341a45d03b57dbb2e08177f66654ca 100644
--- a/config/sync/field.storage.rdf_entity.field_isr_solution_type.yml
+++ b/config/sync/field.storage.rdf_entity.field_isr_solution_type.yml
@@ -8,7 +8,7 @@ third_party_settings:
   sparql_entity_storage:
     mapping:
       target_id:
-        predicate: 'http://joinup.eu/test_resource_type'
+        predicate: 'http://purl.org/dc/terms/type'
         format: resource
 id: rdf_entity.field_isr_solution_type
 field_name: field_isr_solution_type
diff --git a/web/modules/custom/joinup_rdf/joinup_rdf.install b/web/modules/custom/joinup_rdf/joinup_rdf.install
index 26e747f2dc7ae80de8800987233ab22fa36f8787..438053ef4e986682a9dfd159ae4ae4c49ae85e6d 100644
--- a/web/modules/custom/joinup_rdf/joinup_rdf.install
+++ b/web/modules/custom/joinup_rdf/joinup_rdf.install
@@ -242,3 +242,55 @@ function joinup_rdf_update_110505(): void {
   // Remove provenance records from the RDF backend.
   \Drupal::getContainer()->get('sparql.endpoint')->update("CLEAR GRAPH <http://joinup.eu/provenance_activity>;");
 }
+
+/**
+ * Clean up invalid release type entries and update the predicate.
+ */
+function joinup_rdf_update_110506(): void {
+  $sparql = \Drupal::getContainer()->get('sparql.endpoint');
+  $cleanup_query = <<<SPARQL
+DELETE {
+  GRAPH ?g {
+    ?s <http://joinup.eu/test_resource_type> ?deletedTermUri .
+  }
+}
+WHERE {
+  GRAPH ?g {
+    ?s a <http://www.w3.org/ns/dcat#Dataset> .
+    ?s <http://joinup.eu/test_resource_type> ?deletedTermUri .
+    FILTER NOT EXISTS {
+      SELECT ?deletedTermUri
+      WHERE {
+        GRAPH <http://data> {
+          ?deletedTermUri <http://www.w3.org/2004/02/skos/core#inScheme> <http://data.europa.eu/dr8> .
+        }
+      }
+    }
+  }
+}
+SPARQL;
+
+  $sparql->update($cleanup_query);
+
+  $update_query = <<<SPARQL
+DELETE {
+  GRAPH ?g {
+    ?s <http://joinup.eu/test_resource_type> ?o .
+  }
+}
+INSERT {
+  GRAPH ?g {
+    ?s <http://purl.org/dc/terms/type> ?o .
+  }
+}
+WHERE {
+  GRAPH ?g {
+    ?s a <http://www.w3.org/ns/dcat#Dataset> .
+    ?s <http://joinup.eu/test_resource_type> ?o .
+    VALUES ?g { <http://joinup.eu/asset_release/published> <http://joinup.eu/asset_release/draft> }
+  }
+}
+SPARQL;
+
+  $sparql->update($update_query);
+}