diff --git a/.pullapprove.yml b/.pullapprove.yml
deleted file mode 100644
index 46323c41ab..0000000000
--- a/.pullapprove.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-version: 2
-
-requirements:
-  signed_off_by:
-    required: true
-
-# Disallow approval of PRs still under development
-always_pending:
-  title_regex: '(WIP|RFC)'
-  labels:
-    - do-not-merge
-    - wip
-    - rfc
-  explanation: 'Work in progress - do not merge'
-
-group_defaults:
-  approve_by_comment:
-    enabled: true
-    approve_regex: '^(LGTM|lgtm|Approved|\+1|:\+1:)'
-    reject_regex: '^(Rejected|-1|:-1:)'
-  reset_on_push:
-    enabled: false
-  reset_on_reopened:
-    enabled: false
-  author_approval:
-    ignored: true
-
-groups:
-  approvers:
-    required: 2
-    teams:
-      - agent
-
-  documentation:
-    required: 1
-    teams:
-      - documentation
-    conditions:
-      files:
-        include:
-          - "*.md"
-        exclude:
-          - "vendor/*"
-
-  protocol-changes:
-    required: 2
-    teams:
-      - architecture-committee
-      - builder
-      - packaging
-    conditions:
-      files:
-        include:
-          - "*.proto"
-        exclude:
-          - "vendor/*"
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000000..72b0a29129
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,18 @@
+# Copyright 2019 Intel Corporation.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Define any code owners for this repository.
+# The code owners lists are used to help automatically enforce
+# reviews and acks of the right groups on the right PRs.
+
+# Order in this file is important. Only the last match will be
+# used. See https://help.github.com/articles/about-code-owners/
+
+*.md    @kata-containers/documentation
+
+# All protocol changes need to get some review from these groups.
+# Note, we include all subdirs, including the vendor dir, as at present there are no .proto files
+# in the vendor dir. Later we may have to extend this matching rule if that changes.
+*.proto    @kata-containers/architecture-committee @kata-containers/builder @kata-containers/packaging
+