diff --git a/classes/emailTemplate/DAO.php b/classes/emailTemplate/DAO.php
index 3e2fca2e1c9..e942fc2d5c0 100644
--- a/classes/emailTemplate/DAO.php
+++ b/classes/emailTemplate/DAO.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file classes/emailTemplate/DAO.php
  *
@@ -21,9 +22,10 @@ class DAO extends \PKP\emailTemplate\DAO
     protected function variablesToRename(): array
     {
         return [
-            'contextName' => 'pressName',
-            'contextUrl' => 'pressUrl',
-            'contextSignature' => 'pressSignature',
+            'pressName' => 'contextName',
+            'pressUrl' => 'contextUrl',
+            'pressSignature' => 'contextSignature',
+            'pressAcronym' => 'contextAcronym'
         ];
     }
 }
diff --git a/classes/mail/variables/ContextEmailVariable.php b/classes/mail/variables/ContextEmailVariable.php
index d7e80011d1a..97ca41244de 100644
--- a/classes/mail/variables/ContextEmailVariable.php
+++ b/classes/mail/variables/ContextEmailVariable.php
@@ -20,24 +20,6 @@
 
 class ContextEmailVariable extends PKPContextEmailVariable
 {
-    public const CONTEXT_NAME = 'pressName';
-    public const CONTEXT_URL = 'pressUrl';
-    public const CONTEXT_SIGNATURE = 'pressSignature';
-    public const CONTEXT_ACRONYM = 'contextAcronym';
-
-    /**
-     * @copydoc Variable::descriptions()
-     */
-    public static function descriptions(): array
-    {
-        return array_merge(
-            parent::descriptions(),
-            [
-                static::CONTEXT_ACRONYM => __('emailTemplate.variable.context.contextAcronym'),
-            ]
-        );
-    }
-
     /**
      * @copydoc Variable::values()
      */
@@ -48,8 +30,6 @@ public function values(string $locale): array
         // Pass the values into the context signature so variables
         // used in the signature can be rendered.
         $values[static::CONTEXT_SIGNATURE] = $this->getContextSignature($values);
-        $values[static::CONTEXT_ACRONYM] = htmlspecialchars($this->context->getLocalizedData('acronym'));
-
         return $values;
     }
 }
diff --git a/classes/migration/upgrade/v3_4_0/InstallEmailTemplates.php b/classes/migration/upgrade/v3_4_0/InstallEmailTemplates.php
index 7c4ac7a89e4..c124f0b0caa 100644
--- a/classes/migration/upgrade/v3_4_0/InstallEmailTemplates.php
+++ b/classes/migration/upgrade/v3_4_0/InstallEmailTemplates.php
@@ -47,10 +47,6 @@ protected function getEmailTemplateKeys(): array
 
     protected function getAppVariableNames(): array
     {
-        return [
-            'contextName' => 'pressName',
-            'contextUrl' => 'pressUrl',
-            'contextSignature' => 'pressSignature',
-        ];
+        return [];
     }
 }
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index dceb916e9c0..5847505cab4 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -163,6 +163,7 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\I11238_PrepareDBForStructuredCitations"/>
 		<migration class="APP\migration\upgrade\v3_5_0\I11241_MissingDecisionConstantsUpdate"/>
 		<migration class="APP\migration\upgrade\v3_5_0\I11125_UpdateEmailTemplateVariables"/>
+		<migration class="PKP\migration\upgrade\v3_5_0\I10962_UpdateEmailTemplateVariables"/>
 		<code function="downloadIPGeoDB"/>
 		<note file="docs/release-notes/README-3.5.0" />
 	</upgrade>
@@ -200,6 +201,7 @@
         <migration class="PKP\migration\upgrade\v3_6_0\I12049_AddPublishReviewCurateSupport"/>
         <migration class="PKP\migration\upgrade\v3_6_0\I12078_RemoveSettingTypeInCitationSettings"/>
 		<migration class="PKP\migration\upgrade\v3_6_0\I11971_RemoveShowTitleInUserGroups"/>
+		<migration class="PKP\migration\upgrade\v3_5_0\I10962_UpdateEmailTemplateVariables"/>
 		<code function="rebuildSearchIndex" />
 		<note file="docs/release-notes/README-3.6.0" />
 	</upgrade>
diff --git a/lib/pkp b/lib/pkp
index 638f0ad3b89..834bada444f 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 638f0ad3b89be36bd5e8d698f58f58b873dec9ff
+Subproject commit 834bada444f5d6386075b1844107d0093c75974b