diff --git a/modules/oe_content_event/modules/oe_content_event_person_reference/oe_content_event_person_reference.post_update.php b/modules/oe_content_event/modules/oe_content_event_person_reference/oe_content_event_person_reference.post_update.php
new file mode 100644
index 000000000..ebda6aef3
--- /dev/null
+++ b/modules/oe_content_event/modules/oe_content_event_person_reference/oe_content_event_person_reference.post_update.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Post update functions for OpenEuropa Content Event Person reference module.
+ */
+
+declare(strict_types = 1);
+
+use Drupal\field\Entity\FieldConfig;
+
+/**
+ * Set "composite revisions" option for reference fields.
+ */
+function oe_content_event_person_reference_post_update_00001(): void {
+  $field_config = FieldConfig::load('oe_event_speaker.oe_default.oe_person');
+  $field_config->setThirdPartySetting('composite_reference', 'composite_revisions', FALSE);
+  $field_config->save();
+}
diff --git a/modules/oe_content_event/oe_content_event.post_update.php b/modules/oe_content_event/oe_content_event.post_update.php
index f02c11a99..e88af241a 100644
--- a/modules/oe_content_event/oe_content_event.post_update.php
+++ b/modules/oe_content_event/oe_content_event.post_update.php
@@ -142,7 +142,6 @@ function oe_content_event_post_update_20004(): void {
     'node.oe_event.oe_event_contact' => TRUE,
     'node.oe_event.oe_event_media' => FALSE,
     'node.oe_event.oe_event_venue' => TRUE,
-    'oe_event_speaker.oe_default.oe_person' => FALSE,
   ];
   foreach ($fields as $field => $value) {
     $field_config = FieldConfig::load($field);
diff --git a/modules/oe_content_organisation/modules/oe_content_organisation_person_reference/oe_content_organisation_person_reference.post_update.php b/modules/oe_content_organisation/modules/oe_content_organisation_person_reference/oe_content_organisation_person_reference.post_update.php
new file mode 100644
index 000000000..09df83a68
--- /dev/null
+++ b/modules/oe_content_organisation/modules/oe_content_organisation_person_reference/oe_content_organisation_person_reference.post_update.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Post update functions for OpenEuropa Organisation Person Reference module.
+ */
+
+declare(strict_types = 1);
+
+use Drupal\field\Entity\FieldConfig;
+
+/**
+ * Set "composite revisions" option for reference fields.
+ */
+function oe_content_organisation_person_reference_post_update_00001(): void {
+  $field_config = FieldConfig::load('node.oe_organisation.oe_organisation_persons');
+  $field_config->setThirdPartySetting('composite_reference', 'composite_revisions', FALSE);
+  $field_config->save();
+}
diff --git a/modules/oe_content_organisation/modules/oe_content_organisation_reference/oe_content_organisation_reference.post_update.php b/modules/oe_content_organisation/modules/oe_content_organisation_reference/oe_content_organisation_reference.post_update.php
new file mode 100644
index 000000000..afe2b47ba
--- /dev/null
+++ b/modules/oe_content_organisation/modules/oe_content_organisation_reference/oe_content_organisation_reference.post_update.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Post update functions for OpenEuropa Organisation Reference module.
+ */
+
+declare(strict_types = 1);
+
+use Drupal\field\Entity\FieldConfig;
+
+/**
+ * Set "composite revisions" option for reference fields.
+ */
+function oe_content_organisation_reference_post_update_00001(): void {
+  $field_config = FieldConfig::load('oe_contact.oe_organisation_reference.oe_node_reference');
+  $field_config->setThirdPartySetting('composite_reference', 'composite_revisions', FALSE);
+  $field_config->save();
+}
diff --git a/modules/oe_content_organisation/oe_content_organisation.post_update.php b/modules/oe_content_organisation/oe_content_organisation.post_update.php
index 9bcd179c0..5e976d2c3 100644
--- a/modules/oe_content_organisation/oe_content_organisation.post_update.php
+++ b/modules/oe_content_organisation/oe_content_organisation.post_update.php
@@ -104,7 +104,6 @@ function oe_content_organisation_post_update_20007(): void {
     'node.oe_organisation.oe_organisation_chart' => FALSE,
     'node.oe_organisation.oe_organisation_contact' => TRUE,
     'node.oe_organisation.oe_organisation_logo' => FALSE,
-    'oe_contact.oe_organisation_reference.oe_node_reference' => FALSE,
   ];
   foreach ($fields as $field => $value) {
     $field_config = FieldConfig::load($field);
diff --git a/modules/oe_content_publication/oe_content_publication.post_update.php b/modules/oe_content_publication/oe_content_publication.post_update.php
index 15af23628..e993279f5 100644
--- a/modules/oe_content_publication/oe_content_publication.post_update.php
+++ b/modules/oe_content_publication/oe_content_publication.post_update.php
@@ -214,10 +214,6 @@ function oe_content_publication_post_update_20002(): void {
  * Set "composite revisions" option for reference fields.
  */
 function oe_content_publication_post_update_20003(): void {
-  $field_config = FieldConfig::load('node.oe_publication.oe_publication_contacts');
-  $field_config->setThirdPartySetting('composite_reference', 'composite_revisions', TRUE);
-  $field_config->save();
-
   $fields = [
     'node.oe_publication.oe_publication_contacts' => TRUE,
     'node.oe_publication.oe_publication_publications' => FALSE,