diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 35a9adbe13..71cf2895ce 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -146,6 +146,8 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\I10738_RemoveInvalidUserGroups"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I10362_EventLogEditorNames"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I10292_RemoveControlledVocabEntrySettingType"/>
+		<migration class="PKP\migration\upgrade\v3_5_0\I10292_UpdateControlledVocabAssocId"/>
+		<migration class="PKP\migration\upgrade\v3_5_0\I10292_UpdateControlledVocabEntrySettingName"/>
 	</upgrade>
 
 	<!-- Update plugin configuration - should be done as the final upgrade task -->
diff --git a/tools/cleanReviewerInterests.php b/tools/cleanReviewerInterests.php
index 8c923500fb..2c44645fbe 100755
--- a/tools/cleanReviewerInterests.php
+++ b/tools/cleanReviewerInterests.php
@@ -14,6 +14,7 @@
  * @brief CLI tool to remove user interests that are not referenced by any user accounts.
  */
 
+use APP\core\Application;
 use APP\facades\Repo;
 use Illuminate\Support\Collection;
 use PKP\cliTool\CommandLineTool;
@@ -91,8 +92,8 @@ protected function _getOrphanVocabInterests(): Collection
     {
         $controlledVocab = Repo::controlledVocab()->build(
             UserInterest::CONTROLLED_VOCAB_INTEREST,
-            UserInterest::CONTROLLED_VOCAB_INTEREST_ASSOC_TYPE,
-            UserInterest::CONTROLLED_VOCAB_INTEREST_ASSOC_ID
+            Application::ASSOC_TYPE_SITE,
+            Application::SITE_CONTEXT_ID,
         );
 
         return ControlledVocabEntry::query()