diff --git a/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-1.4-TxnCommitTimeIndex.sql b/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-1.4-TxnCommitTimeIndex.sql
index fe895a8db3..a8f88e73a6 100644
--- a/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-1.4-TxnCommitTimeIndex.sql
+++ b/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-1.4-TxnCommitTimeIndex.sql
@@ -13,5 +13,5 @@ insert into alf_applied_patch
   values
   (
     'patch.db-V1.4-TxnCommitTimeIndex', 'Executed script AlfrescoSchemaUpdate-1.4-TxnCommitTimeIndex.sql',
-    0, 75, -1, 76, null, 'UNKOWN', 1, 1, 'Script completed'
+    0, 75, -1, 76, null, 'UNKOWN', ${TRUE}, ${TRUE}, 'Script completed'
   );
\ No newline at end of file
diff --git a/config/alfresco/dbscripts/upgrade/2.0/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.0-ContentUrls.sql b/config/alfresco/dbscripts/upgrade/2.0/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.0-ContentUrls.sql
index 0dc44392c1..0263eabfcc 100644
--- a/config/alfresco/dbscripts/upgrade/2.0/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.0-ContentUrls.sql
+++ b/config/alfresco/dbscripts/upgrade/2.0/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.0-ContentUrls.sql
@@ -20,5 +20,5 @@ INSERT INTO alf_applied_patch
   VALUES
   (
     'patch.db-V2.0-ContentUrls', 'Manually executed script upgrade V2.0: Indexes for alf_content_url table',
-    0, 123, -1, 124, null, 'UNKOWN', 1, 1, 'Script completed'
+    0, 123, -1, 124, null, 'UNKOWN', ${TRUE}, ${TRUE}, 'Script completed'
   );
\ No newline at end of file
diff --git a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-JBPMData.sql b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-JBPMData.sql
index abe347cb71..b53ef811c8 100644
--- a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-JBPMData.sql
+++ b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-JBPMData.sql
@@ -8,7 +8,7 @@
 --
 
 UPDATE JBPM_TASK SET PRIORITY_ = 2;
-UPDATE JBPM_NODE SET ISASYNCEXCL_ = 0;
+UPDATE JBPM_NODE SET ISASYNCEXCL_ = ${FALSE};
 UPDATE JBPM_MODULEINSTANCE SET VERSION_ = 0;
 UPDATE JBPM_POOLEDACTOR SET VERSION_ = 0;
 UPDATE JBPM_SWIMLANEINSTANCE SET VERSION_ = 0;
@@ -25,5 +25,5 @@ INSERT INTO alf_applied_patch
   VALUES
   (
     'patch.db-V2.1-JBPMUpdate', 'Manually executed script upgrade V2.1: JBPM 3.1.2 to 3.2 Data Upgrade',
-    0, 51, -1, 52, null, 'UNKOWN', 1, 1, 'Script completed'
+    0, 51, -1, 52, null, 'UNKOWN', ${TRUE}, ${TRUE}, 'Script completed'
   );
\ No newline at end of file
diff --git a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-NotNullColumns.sql b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-NotNullColumns.sql
index 031aa1132c..8a3ec9621b 100644
--- a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-NotNullColumns.sql
+++ b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-NotNullColumns.sql
@@ -17,5 +17,5 @@ INSERT INTO alf_applied_patch
   VALUES
   (
     'patch.db-V2.1-NotNullColumns', 'Manually executed script upgrade V2.1: Add nullable columns',
-    0, 63, -1, 64, null, 'UNKOWN', 1, 1, 'Script completed'
+    0, 63, -1, 64, null, 'UNKOWN', ${TRUE}, ${TRUE}, 'Script completed'
   );
\ No newline at end of file
diff --git a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql
index 9e4f092f55..97c3acb5ea 100644
--- a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql
+++ b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql
@@ -31,5 +31,5 @@ INSERT INTO alf_applied_patch
   VALUES
   (
     'patch.db-V2.1-RemoveWcmSubmittedAspect', 'Manually executed script upgrade V2.1: Remove wcmwf:submitted aspect',
-    0, 72, -1, 73, null, 'UNKOWN', 1, 1, 'Script completed'
+    0, 72, -1, 73, null, 'UNKOWN', ${TRUE}, ${TRUE}, 'Script completed'
   );
\ No newline at end of file
diff --git a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-VersionColumns.sql b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-VersionColumns.sql
index a369bc6030..d745ac541f 100644
--- a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-VersionColumns.sql
+++ b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-VersionColumns.sql
@@ -29,5 +29,5 @@ INSERT INTO alf_applied_patch
   VALUES
   (
     'patch.db-V2.1-VersionColumns2', 'Manually executed script upgrade V2.1: Created initial version number for ADM entities',
-    0, 63, -1, 64, null, 'UNKOWN', 1, 1, 'Script completed'
+    0, 63, -1, 64, null, 'UNKOWN', ${TRUE}, ${TRUE}, 'Script completed'
   );
\ No newline at end of file