diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 88936c584..a67698f8f 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,17 +1,3 @@
-# Copyright 2021 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:ec49167c606648a063d1222220b48119c912562849a0528f35bfb592a9f72737
+  digest: sha256:74124fe59b8859f30143dcdea7b78300046d97de816dc53c0e381308a5f4f8bc
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c9c9806c1..c7eaf450d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,9 +3,10 @@
 #
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
+# Note: This file is autogenerated. To make changes to the codeowner team, please update .repo-metadata.json.
 
-# The @googleapis/yoshi-python and @googleapis/actools are the default code owners for changes in this repo
-*               @googleapis/yoshi-python @googleapis/actools
+# @googleapis/yoshi-python @googleapis/api-compute are the default owners for changes in this repo
+*     @googleapis/yoshi-python @googleapis/api-compute
 
-
-/samples/   @m-strzelczyk @googleapis/python-samples-owners
+# @googleapis/python-samples-owners @googleapis/api-compute are the default owners for samples changes
+/samples/   @googleapis/python-samples-owners @googleapis/api-compute