diff --git a/examples/factory_demo/CMakeLists.txt b/examples/factory_demo/CMakeLists.txt
index 43aaaf4..3e4cbc5 100644
--- a/examples/factory_demo/CMakeLists.txt
+++ b/examples/factory_demo/CMakeLists.txt
@@ -4,17 +4,9 @@ cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-if(DEFINED ENV{RMAKER_PATH})
-  set(RMAKER_PATH $ENV{RMAKER_PATH})
-else()
-  set(RMAKER_PATH ${CMAKE_CURRENT_LIST_DIR}/../../components/esp-rainmaker)
-  message("-- Not find RMAKER_PATH, default is ${RMAKER_PATH}")
-endif(DEFINED ENV{RMAKER_PATH})
-
 set(EXTRA_COMPONENT_DIRS
     ../../components
     $ENV{IDF_PATH}/examples/common_components
-    ${RMAKER_PATH}/components
     )
 
 add_compile_options(-fdiagnostics-color=always)
diff --git a/examples/factory_demo/main/idf_component.yml b/examples/factory_demo/main/idf_component.yml
index c20773d..ec0f9e4 100644
--- a/examples/factory_demo/main/idf_component.yml
+++ b/examples/factory_demo/main/idf_component.yml
@@ -1,23 +1,23 @@
 ## IDF Component Manager Manifest File
 dependencies:
+  chmorgan/esp-audio-player: "1.0.3"
+  chmorgan/esp-file-iterator: "1.0.0"
+  chmorgan/esp-libhelix-mp3: "1.0.3"
+
+  espressif/esp_rainmaker:
+    path: components/esp_rainmaker
+    git: https://github.com/espressif/esp-rainmaker.git
+  espressif/esp_schedule:
+    path: components/esp_schedule
+    git: https://github.com/espressif/esp-rainmaker.git
   espressif/led_strip:
     version: "~2.0.0"
     rules:
       - if: "idf_version >=5.0"
-  chmorgan/esp-libhelix-mp3: "1.0.3"
-  chmorgan/esp-file-iterator: "1.0.0"
-  chmorgan/esp-audio-player: "1.0.3"
-  ## Required IDF version
-  idf:
-    version: ">=4.1.0"
-  # # Put list of dependencies here
-  # # For components maintained by Espressif:
-  # component: "~1.0.0"
-  # # For 3rd party components:
-  # username/component: ">=1.0.0,<2.0.0"
-  # username2/component2:
-  #   version: "~1.0.0"
-  #   # For transient dependencies `public` flag can be set.
-  #   # `public` flag doesn't have an effect dependencies of the `main` component.
-  #   # All dependencies of `main` are public by default.
-  #   public: true
+  espressif/json_generator: ^1
+  espressif/json_parser: =1.0.0
+  espressif/qrcode:
+    version: ^0.1.0
+    rules:
+      - if: "idf_version >=5.0"
+  espressif/rmaker_common: ^1
\ No newline at end of file
diff --git a/examples/watering_demo/CMakeLists.txt b/examples/watering_demo/CMakeLists.txt
index 9d4db3a..953bb0c 100644
--- a/examples/watering_demo/CMakeLists.txt
+++ b/examples/watering_demo/CMakeLists.txt
@@ -4,16 +4,8 @@ cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-if(DEFINED ENV{RMAKER_PATH})
-  set(RMAKER_PATH $ENV{RMAKER_PATH})
-else()
-  set(RMAKER_PATH ${CMAKE_CURRENT_LIST_DIR}/../../components/esp-rainmaker)
-  message("-- Not find RMAKER_PATH, default is ${RMAKER_PATH}")
-endif(DEFINED ENV{RMAKER_PATH})
-
 set(EXTRA_COMPONENT_DIRS
     ../../components
-    ${RMAKER_PATH}/components
     )
 
 add_compile_options(-fdiagnostics-color=always)
diff --git a/examples/watering_demo/main/idf_component.yml b/examples/watering_demo/main/idf_component.yml
new file mode 100644
index 0000000..fa73362
--- /dev/null
+++ b/examples/watering_demo/main/idf_component.yml
@@ -0,0 +1,12 @@
+## IDF Component Manager Manifest File
+dependencies:
+  espressif/esp_rainmaker:
+    path: components/esp_rainmaker
+    git: https://github.com/espressif/esp-rainmaker.git
+  espressif/esp_schedule:
+    path: components/esp_schedule
+    git: https://github.com/espressif/esp-rainmaker.git
+  espressif/json_generator: ^1
+  espressif/json_parser: =1.0.0
+  espressif/qrcode: ^0.1.0
+  espressif/rmaker_common: ^1