diff --git a/src/workflows/Product2.workflow b/src/workflows/Product2.workflow
index d6f0a87..1923b70 100644
--- a/src/workflows/Product2.workflow
+++ b/src/workflows/Product2.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>Product2.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__ContractedPrice__c.workflow b/src/workflows/SBQQ__ContractedPrice__c.workflow
index a8f4503..1923b70 100644
--- a/src/workflows/SBQQ__ContractedPrice__c.workflow
+++ b/src/workflows/SBQQ__ContractedPrice__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -15,11 +16,9 @@
             <name>Set_External_Id</name>
             <type>FieldUpdate</type>
         </actions>
-        <active>false</active>
-        <criteriaItems>
-            <field>SBQQ__ContractedPrice__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <active>true</active>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__CustomActionCondition__c.workflow b/src/workflows/SBQQ__CustomActionCondition__c.workflow
index 618f9c7..8ad5638 100644
--- a/src/workflows/SBQQ__CustomActionCondition__c.workflow
+++ b/src/workflows/SBQQ__CustomActionCondition__c.workflow
@@ -17,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__CustomActionCondition__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__CustomAction__c.workflow b/src/workflows/SBQQ__CustomAction__c.workflow
index 5a4ace9..1923b70 100644
--- a/src/workflows/SBQQ__CustomAction__c.workflow
+++ b/src/workflows/SBQQ__CustomAction__c.workflow
@@ -17,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__CustomAction__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__CustomScript__c.workflow b/src/workflows/SBQQ__CustomScript__c.workflow
index 81c7d88..1923b70 100644
--- a/src/workflows/SBQQ__CustomScript__c.workflow
+++ b/src/workflows/SBQQ__CustomScript__c.workflow
@@ -17,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__CustomScript__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__DiscountSchedule__c.workflow b/src/workflows/SBQQ__DiscountSchedule__c.workflow
index 73d515b..1923b70 100644
--- a/src/workflows/SBQQ__DiscountSchedule__c.workflow
+++ b/src/workflows/SBQQ__DiscountSchedule__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__DiscountSchedule__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__ErrorCondition__c.workflow b/src/workflows/SBQQ__ErrorCondition__c.workflow
index 6369bca..1923b70 100644
--- a/src/workflows/SBQQ__ErrorCondition__c.workflow
+++ b/src/workflows/SBQQ__ErrorCondition__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__ErrorCondition__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__ImportColumn__c.workflow b/src/workflows/SBQQ__ImportColumn__c.workflow
index 89ec7aa..7f31792 100644
--- a/src/workflows/SBQQ__ImportColumn__c.workflow
+++ b/src/workflows/SBQQ__ImportColumn__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &quot;:&quot; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__ImportColumn__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__ImportFormat__c.workflow b/src/workflows/SBQQ__ImportFormat__c.workflow
index 81674bc..7f31792 100644
--- a/src/workflows/SBQQ__ImportFormat__c.workflow
+++ b/src/workflows/SBQQ__ImportFormat__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &quot;:&quot; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__ImportFormat__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__LineColumn__c.workflow b/src/workflows/SBQQ__LineColumn__c.workflow
index 7e859eb..1923b70 100644
--- a/src/workflows/SBQQ__LineColumn__c.workflow
+++ b/src/workflows/SBQQ__LineColumn__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__LineColumn__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__LookupQuery__c.workflow b/src/workflows/SBQQ__LookupQuery__c.workflow
index 61aa570..1923b70 100644
--- a/src/workflows/SBQQ__LookupQuery__c.workflow
+++ b/src/workflows/SBQQ__LookupQuery__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__LookupQuery__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__OptionConstraint__c.workflow b/src/workflows/SBQQ__OptionConstraint__c.workflow
index a7befb3..1923b70 100644
--- a/src/workflows/SBQQ__OptionConstraint__c.workflow
+++ b/src/workflows/SBQQ__OptionConstraint__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__OptionConstraint__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__PriceAction__c.workflow b/src/workflows/SBQQ__PriceAction__c.workflow
index a5cdd5d..1923b70 100644
--- a/src/workflows/SBQQ__PriceAction__c.workflow
+++ b/src/workflows/SBQQ__PriceAction__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__PriceAction__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__PriceCondition__c.workflow b/src/workflows/SBQQ__PriceCondition__c.workflow
index e317246..1923b70 100644
--- a/src/workflows/SBQQ__PriceCondition__c.workflow
+++ b/src/workflows/SBQQ__PriceCondition__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__PriceCondition__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__PriceRule__c.workflow b/src/workflows/SBQQ__PriceRule__c.workflow
index 172194f..1923b70 100644
--- a/src/workflows/SBQQ__PriceRule__c.workflow
+++ b/src/workflows/SBQQ__PriceRule__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__PriceRule__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__ProcessInput__c.workflow b/src/workflows/SBQQ__ProcessInput__c.workflow
index 7632760..1923b70 100644
--- a/src/workflows/SBQQ__ProcessInput__c.workflow
+++ b/src/workflows/SBQQ__ProcessInput__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__ProcessInput__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__ProductAction__c.workflow b/src/workflows/SBQQ__ProductAction__c.workflow
index cd91e06..1923b70 100644
--- a/src/workflows/SBQQ__ProductAction__c.workflow
+++ b/src/workflows/SBQQ__ProductAction__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__ProductAction__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__ProductFeature__c.workflow b/src/workflows/SBQQ__ProductFeature__c.workflow
index 360892a..1923b70 100644
--- a/src/workflows/SBQQ__ProductFeature__c.workflow
+++ b/src/workflows/SBQQ__ProductFeature__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__ProductFeature__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__ProductOption__c.workflow b/src/workflows/SBQQ__ProductOption__c.workflow
index 444e39f..1923b70 100644
--- a/src/workflows/SBQQ__ProductOption__c.workflow
+++ b/src/workflows/SBQQ__ProductOption__c.workflow
@@ -17,11 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__ProductOption__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
         <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__ProductRule__c.workflow b/src/workflows/SBQQ__ProductRule__c.workflow
index 736ce9b..1923b70 100644
--- a/src/workflows/SBQQ__ProductRule__c.workflow
+++ b/src/workflows/SBQQ__ProductRule__c.workflow
@@ -17,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__ProductRule__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__QuoteProcess__c.workflow b/src/workflows/SBQQ__QuoteProcess__c.workflow
index bf8ec22..1923b70 100644
--- a/src/workflows/SBQQ__QuoteProcess__c.workflow
+++ b/src/workflows/SBQQ__QuoteProcess__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__QuoteProcess__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__QuoteTemplate__c.workflow b/src/workflows/SBQQ__QuoteTemplate__c.workflow
index e863a0b..1923b70 100644
--- a/src/workflows/SBQQ__QuoteTemplate__c.workflow
+++ b/src/workflows/SBQQ__QuoteTemplate__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__QuoteTemplate__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__QuoteTerm__c.workflow b/src/workflows/SBQQ__QuoteTerm__c.workflow
index d4cd220..7f31792 100644
--- a/src/workflows/SBQQ__QuoteTerm__c.workflow
+++ b/src/workflows/SBQQ__QuoteTerm__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &quot;:&quot; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__QuoteTerm__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__SearchFilter__c.workflow b/src/workflows/SBQQ__SearchFilter__c.workflow
index be6a4e2..1923b70 100644
--- a/src/workflows/SBQQ__SearchFilter__c.workflow
+++ b/src/workflows/SBQQ__SearchFilter__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__SearchFilter__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__SummaryVariable__c.workflow b/src/workflows/SBQQ__SummaryVariable__c.workflow
index 4616464..8fc38c5 100644
--- a/src/workflows/SBQQ__SummaryVariable__c.workflow
+++ b/src/workflows/SBQQ__SummaryVariable__c.workflow
@@ -17,10 +17,7 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__SummaryVariable__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
-        <triggerType>onCreateOrTriggeringUpdate</triggerType>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
+        <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__TemplateContent__c.workflow b/src/workflows/SBQQ__TemplateContent__c.workflow
index 4945b86..1923b70 100644
--- a/src/workflows/SBQQ__TemplateContent__c.workflow
+++ b/src/workflows/SBQQ__TemplateContent__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__TemplateContent__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>
diff --git a/src/workflows/SBQQ__TemplateSection__c.workflow b/src/workflows/SBQQ__TemplateSection__c.workflow
index 40fab1c..1923b70 100644
--- a/src/workflows/SBQQ__TemplateSection__c.workflow
+++ b/src/workflows/SBQQ__TemplateSection__c.workflow
@@ -2,6 +2,7 @@
 <Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
     <fieldUpdates>
         <fullName>Set_External_Id</fullName>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
         <field>ExternalId__c</field>
         <formula>$Organization.Id + &apos;:&apos; + CASESAFEID(Id)</formula>
         <name>Set External Id</name>
@@ -16,10 +17,8 @@
             <type>FieldUpdate</type>
         </actions>
         <active>true</active>
-        <criteriaItems>
-            <field>SBQQ__TemplateSection__c.ExternalId__c</field>
-            <operation>equals</operation>
-        </criteriaItems>
+        <description>Sets External Id to be the concatenation of the Org Id and the Record Id.</description>
+        <formula>OR( ISBLANK(ExternalId__c), AND(ISNEW(),ISCLONE()) )</formula>
         <triggerType>onAllChanges</triggerType>
     </rules>
 </Workflow>