diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 911a08d0e..6882f1c52 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,14 +30,14 @@ jobs:
       run: |
         cd ${ROOT_DIR}/src/third_party/${REPO_NAME}/
         git checkout ${{ github.sha }}
-        cp ci/* ${ROOT_DIR}/src/
+        cp -r ci/* ${ROOT_DIR}/src/
     - name: Fetch pull request code.
       if: github.event_name == 'pull_request'
       run: |
         cd ${ROOT_DIR}/src/third_party/${REPO_NAME}/
         git fetch origin pull/${{ github.event.number }}/head:${{ github.head_ref }}
         git checkout ${{ github.head_ref }}
-        cp ci/* ${ROOT_DIR}/src/
+        cp -r ci/* ${ROOT_DIR}/src/
   build-package:
     needs: fetch-code
     runs-on: self-hosted
diff --git a/ci/intel-nnhal-9999.ebuild b/ci/intel-nnhal-dev/intel-nnhal-dev-9999.ebuild
similarity index 97%
rename from ci/intel-nnhal-9999.ebuild
rename to ci/intel-nnhal-dev/intel-nnhal-dev-9999.ebuild
index dc8e906c6..e01f8abc3 100644
--- a/ci/intel-nnhal-9999.ebuild
+++ b/ci/intel-nnhal-dev/intel-nnhal-dev-9999.ebuild
@@ -21,7 +21,7 @@ SLOT="0/0"
 
 RDEPEND="
 	chromeos-base/aosp-frameworks-ml-nn
-	chromeos-base/intel-openvino
+	chromeos-base/intel-openvino-dev
 "
 
 DEPEND="
diff --git a/ci/0001-Compilation-changes-for-CrOS-ov-master.patch b/ci/intel-openvino-dev/files/0001-Compilation-changes-for-CrOS-ov-master.patch
similarity index 100%
rename from ci/0001-Compilation-changes-for-CrOS-ov-master.patch
rename to ci/intel-openvino-dev/files/0001-Compilation-changes-for-CrOS-ov-master.patch
diff --git a/ci/intel-openvino-9999.ebuild b/ci/intel-openvino-dev/intel-openvino-dev-9999.ebuild
similarity index 100%
rename from ci/intel-openvino-9999.ebuild
rename to ci/intel-openvino-dev/intel-openvino-dev-9999.ebuild