diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
deleted file mode 100644
index cf78c13e..00000000
--- a/.github/workflows/spelling.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Spell checking
-on:
-  push:
-    branches:
-    - master
-    - 'release-*'
-  pull_request:
-    branches:
-    - master
-
-jobs:
-  build:
-    name: Spell checking
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2.0.0
-      with:
-        fetch-depth: 5
-    - uses: check-spelling/check-spelling@prerelease
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 00000000..31985268
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,2 @@
+# All
+* @jannfis @chengfang @pasha-codefresh
diff --git a/OWNERS b/OWNERS
index af5da3f3..93df25cb 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,5 +2,7 @@ owners:
 - jannfis
 
 approvers:
+- chengfang
+- pasha-codefresh
 
-reviewers:
\ No newline at end of file
+reviewers: