diff --git a/dbscripts/xml/install.xml b/dbscripts/xml/install.xml
index fdec64eaf7..51bb76191f 100644
--- a/dbscripts/xml/install.xml
+++ b/dbscripts/xml/install.xml
@@ -10,7 +10,7 @@
   * Installation descriptor file.
   -->
 
-<install version="3.5.0.0">
+<install version="3.6.0.0">
 	<code function="checkPhpVersion" />
 
 	<code function="createDirectories"/>
@@ -47,6 +47,7 @@
 	<migration class="PKP\migration\install\HighlightsMigration" />
 	<migration class="PKP\migration\install\InstitutionsMigration" />
 	<migration class="APP\migration\install\MetricsMigration" />
+	<migration class="PKP\migration\install\EmailTemplateUserGroupAccessMigration"/>
 
 	<!-- Other install tasks -->
 	<code function="createData"/>
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 271d44b044..41f912e176 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -11,7 +11,7 @@
   *
   -->
 
-<install version="3.5.0.0">
+<install version="3.6.0.0">
 	<code function="checkPhpVersion" />
 
 	<upgrade minversion="0.9.9.0" maxversion="3.2.9.9">
@@ -137,6 +137,10 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\I10738_RemoveInvalidUserGroups"/>
 	</upgrade>
 
+	<upgrade minversion="3.5.0.0" maxversion="3.5.9.9">
+		<migration class="PKP\migration\upgrade\v3_6_0\PreflightCheckMigration" fallback="3.5.9.9" />
+		<migration class="PKP\migration\upgrade\v3_6_0\I10403_EmailTemplateUserGroupAccess"/>
+	</upgrade>
 	<!-- update plugin configuration - should be done as the final upgrade task -->
 	<code function="addPluginVersions" />
 </install>