diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1473ae0..3678a0a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,8 +4,9 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/api-bigquery is the default owner for changes in this repo
-*               @googleapis/api-bigquery @googleapis/yoshi-python
 
-# The python-samples-reviewers team is the default owner for samples changes
-/samples/   @googleapis/python-samples-owners @googleapis/api-bigquery @googleapis/yoshi-python
+# @googleapis/yoshi-python and @googleapis/api-bigquery are the default owners for changes in this repo
+*     @googleapis/yoshi-python @googleapis/api-bigquery
+
+# @googleapis/python-samples-owners and @googleapis/api-bigquery are the default owners for samples changes
+/samples/   @googleapis/python-samples-owners @googleapis/api-bigquery
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 20a417c..c5d8bfd 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -1,14 +1,15 @@
 {
-"name": "bigqueryconnection",
-"name_pretty": "Google BigQuery Connection",
-"product_documentation": "https://cloud.google.com/bigquery/docs/reference/bigqueryconnection",
-"client_documentation": "https://googleapis.dev/python/bigqueryconnection/latest",
-"issue_tracker": "",
-"release_level": "ga",
-"language": "python",
-"library_type": "GAPIC_AUTO",
-"repo": "googleapis/python-bigquery-connection",
-"distribution_name": "google-cloud-bigquery-connection",
-"api_id": "bigqueryconnection.googleapis.com",
-"requires_billing": true
-}
\ No newline at end of file
+    "name": "bigqueryconnection",
+    "name_pretty": "Google BigQuery Connection",
+    "product_documentation": "https://cloud.google.com/bigquery/docs/reference/bigqueryconnection",
+    "client_documentation": "https://googleapis.dev/python/bigqueryconnection/latest",
+    "issue_tracker": "",
+    "release_level": "ga",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "repo": "googleapis/python-bigquery-connection",
+    "distribution_name": "google-cloud-bigquery-connection",
+    "api_id": "bigqueryconnection.googleapis.com",
+    "requires_billing": true,
+    "codeowner_team": "@googleapis/api-bigquery"
+}
diff --git a/owlbot.py b/owlbot.py
index d13854b..fe4767f 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -32,53 +32,11 @@
 # Add templated files
 # ----------------------------------------------------------------------------
 templated_files = common.py_library(cov_level=99, microgenerator=True,)
-python.py_samples(skip_readmes=True)
+
 s.move(
     templated_files, excludes=[".coveragerc"]
 )  # the microgenerator has a good coveragerc file
 
-# Remove the replacements below once https://github.com/googleapis/synthtool/pull/1188 is merged
-
-# Update googleapis/repo-automation-bots repo to main in .kokoro/*.sh files
-s.replace(
-    ".kokoro/*.sh", "repo-automation-bots/tree/master", "repo-automation-bots/tree/main"
-)
-
-# Customize CONTRIBUTING.rst to replace master with main
-s.replace(
-    "CONTRIBUTING.rst",
-    "fetch and merge changes from upstream into master",
-    "fetch and merge changes from upstream into main",
-)
-
-s.replace(
-    "CONTRIBUTING.rst", "git merge upstream/master", "git merge upstream/main",
-)
-
-s.replace(
-    "CONTRIBUTING.rst",
-    """export GOOGLE_CLOUD_TESTING_BRANCH=\"master\"""",
-    """export GOOGLE_CLOUD_TESTING_BRANCH=\"main\"""",
-)
-
-s.replace(
-    "CONTRIBUTING.rst", "remote \(``master``\)", "remote (``main``)",
-)
-
-s.replace(
-    "CONTRIBUTING.rst", "blob/master/CONTRIBUTING.rst", "blob/main/CONTRIBUTING.rst",
-)
-
-s.replace(
-    "CONTRIBUTING.rst", "blob/master/noxfile.py", "blob/main/noxfile.py",
-)
-
-s.replace(
-    "docs/conf.py", "master_doc", "root_doc",
-)
-
-s.replace(
-    "docs/conf.py", "# The master toctree document.", "# The root toctree document.",
-)
+python.py_samples(skip_readmes=True)
 
 s.shell.run(["nox", "-s", "blacken"], hide_output=False)