diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index ac81baf..5122806 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -9,6 +9,6 @@ jobs:
    uses: "SFDO-Community/standard-workflows/.github/workflows/beta-2gp.yml@main"
    secrets:
     dev-hub-auth-url: "${{ secrets.DEV_HUB_AUTH_URL }}"
-   with:
-    cumulusci-version: '3.93.0'
-    sfdx-version: '7.209.6'
+  #  with:
+  #   cumulusci-version: '3.93.0'
+  #   sfdx-version: '7.209.6'
diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
index b3edfc6..5bf1d9c 100644
--- a/.github/workflows/feature.yml
+++ b/.github/workflows/feature.yml
@@ -1,16 +1,11 @@
 name: "Feature Test"
 on:
-  push:
-    branches:
-      - feature/**
-
+  pull_request:
+  workflow_dispatch:
 
 jobs:
- feature-test:
-   name: "Feature Test"
-   uses: "SFDO-Community/standard-workflows/.github/workflows/feature.yml@main"
-   secrets:
-    dev-hub-auth-url: "${{ secrets.DEV_HUB_AUTH_URL }}"
-   with:
-    cumulusci-version: '3.93.0'
-    sfdx-version: '7.209.6'
+  feature-test:
+    name: "Feature Test"
+    uses: "SFDO-Community/standard-workflows/.github/workflows/feature.yml@main"
+    secrets:
+      dev-hub-auth-url: "${{ secrets.DEV_HUB_AUTH_URL }}"
\ No newline at end of file
diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
index 1696028..e704693 100644
--- a/.github/workflows/prod.yml
+++ b/.github/workflows/prod.yml
@@ -1,11 +1,11 @@
 on:
-  workflow_dispatch: 
+  workflow_dispatch:
 jobs:
   upload-production-release-2gp:
     name: "Upload Production Release (2GP)"
     uses: SFDO-Community/standard-workflows/.github/workflows/production-2gp.yml@main
-    with:
-      cumulusci-version: '3.93.0'
-      sfdx-version: '7.209.6'
+    # with:
+    #   cumulusci-version: '3.93.0'
+    #   sfdx-version: '7.209.6'
     secrets:
       dev-hub-auth-url: '${{ secrets.PACKAGING_ORG_AUTH_URL }}'
diff --git a/CODEOWNERS b/CODEOWNERS
index ce7a494..f1550f4 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,14 @@
-# Comment line immediately above ownership line is reserved for related other information. Please be careful while editing.
+# Python
+*.py                  @SFDO-Community/sfdo-release-engineers
+
+# CumulusCI
+/cumulusci.yml        @SFDO-Community/sfdo-release-engineers
+/tasks/               @SFDO-Community/sfdo-release-engineers
+
+# Actions
+/.github                @SFDO-Community/sfdo-release-engineers
+/scripts                @SFDO-Community/sfdo-release-engineers
+
+
 #ECCN:Open Source
+#GUSINFO:Open Source,Open Source Workflow
diff --git a/force-app/main/default/classes/UUIDBatchJob.cls b/force-app/main/default/classes/UUIDBatchJob.cls
index f208d4e..ee56f15 100644
--- a/force-app/main/default/classes/UUIDBatchJob.cls
+++ b/force-app/main/default/classes/UUIDBatchJob.cls
@@ -109,12 +109,12 @@ public with sharing class UUIDBatchJob implements Database.Batchable<SObject> {
       }
     );
 
-    Messaging.SingleEmailMessage mail = new Messaging.SingleEmailMessage();
-    mail.setToAddresses(new List<String>{ job.CreatedBy.Email });
-    mail.setSubject('UUID Batch Job Complete');
-    mail.setPlainTextBody(emailBody);
-
     try {
+      Messaging.SingleEmailMessage mail = new Messaging.SingleEmailMessage();
+      mail.setToAddresses(new List<String>{ job.CreatedBy.Email });
+      mail.setSubject('UUID Batch Job Complete');
+      mail.setPlainTextBody(emailBody);
+
       Messaging.sendEmail(new List<Messaging.SingleEmailMessage>{ mail });
     } catch (Exception e) {
       System.debug(
diff --git a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
index e1707b0..d66ee3a 100644
--- a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
+++ b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
@@ -4,7 +4,7 @@
     <available>true</available>
     <description>Sample template for contact that demonstrates how to use the unsubscribe link visualforce object.</description>
     <encodingKey>UTF-8</encodingKey>
-    <name>Unsubscribe Sample Contact Template </name>
+    <name>Sample Contact Template</name>
     <style>none</style>
     <subject>Edit this subject</subject>
     <type>visualforce</type>
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
index e063018..aed24c3 100644
--- a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
@@ -4,7 +4,7 @@
     <available>true</available>
     <description>Sample template for lead that demonstrates how to use the unsubscribe link visualforce object.</description>
     <encodingKey>UTF-8</encodingKey>
-    <name>Unsubscribe Sample Lead Template</name>
+    <name>Sample Lead Template</name>
     <style>none</style>
     <subject>Edit this subject</subject>
     <type>visualforce</type>
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
index 1a92eb7..baf382d 100644
--- a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
@@ -4,7 +4,7 @@
     <available>true</available>
     <description>Sample template for lead that demonstrates how to use the unsubscribe link field in a plain text Visualforce email.</description>
     <encodingKey>UTF-8</encodingKey>
-    <name>Unsubscribe Sample Lead Template-Plain Text</name>
+    <name>Sample Lead Template-Plain Text</name>
     <style>none</style>
     <subject>Edit this subject</subject>
     <type>visualforce</type>