diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..54c05cd6
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,10 @@
+# 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
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..aa56da3a
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,5 @@
+# Critical Changes
+
+# Changes
+
+# Issues Closed
diff --git a/README.markdown b/README.markdown
index 011bf723..88edda55 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,8 +1,6 @@
 Declarative Rollups for Lookup Field Relationships
 ==================================================
 
-[![Build Status](https://travis-ci.org/afawcett/declarative-lookup-rollup-summaries.svg)](https://travis-ci.org/afawcett/declarative-lookup-rollup-summaries)
-
 Features Summary
 ----------------
 
diff --git a/cumulusci.yml b/cumulusci.yml
index 1a418870..2cac382c 100644
--- a/cumulusci.yml
+++ b/cumulusci.yml
@@ -6,6 +6,10 @@ project:
         namespace: dlrs
         api_version: '48.0'
     git:
+        repo_url: https://github.com/SFDO-Community/declarative-lookup-rollup-summaries
+        prefix_beta: beta/
+        prefix_release: release/
+        default_branch: main
     source_format: sfdx
 
 tasks:
@@ -29,6 +33,10 @@ tasks:
         options:
             # Preserve existing code coverage level
             required_org_code_coverage_percent: 87
+            retry_failures:
+                - "unable to obtain exclusive access to this record"
+                - "UNABLE_TO_LOCK_ROW"
+            retry_always: True
 
 flows:
     config_apextest:
@@ -38,7 +46,7 @@ flows:
 
     ci_beta:
         steps:
-            3.5:
+            1.5:
                 task: deploy_test_config
 
     deploy_unmanaged: