diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 49ff74b..4597d44 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
           echo "Apply Patches Required: ${{ vars.IS_APPLY_PATCHES_REQUIRED }}"
           echo "Unit Tests Required: ${{ vars.IS_UNIT_TESTS_REQUIRED }}"
           echo "*** End - Check inputs in repo workflow ***"
-  ci-dev:
+  ci-test-only:
     if: ${{ github.event.inputs.workflowBranch == 'dev' }}
     uses: shardeum/github-automation/.github/workflows/reusable-node-ci.yml@dev
     permissions:
@@ -61,7 +61,7 @@ jobs:
       unit-tests-required: ${{ vars.IS_UNIT_TESTS_REQUIRED == 'true' }}
     secrets: inherit
 
-  ci-main:
+  ci:
     if: ${{ github.event.inputs.workflowBranch == 'main' || !github.event.inputs.workflowBranch }}
     uses: shardeum/github-automation/.github/workflows/reusable-node-ci.yml@main
     permissions:
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000..200b737
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,13 @@
+# CODEOWNERS file
+# To add additional teams to any approval, include them on the same line separated by spaces
+# It is best practice to assign a team as a code owner and not an invidual.
+# Please submit requests for new teams to Systems and Automation
+
+# Global approval (all files)
+# * @shardeum/team-name
+
+# Directory-level approval
+/.github/ @shardeum/systems-and-automation
+
+# Specific file rules
+# README.md @shardeum/team-name