diff --git a/riocli/apply/manifests/deployment-nonros-device.yaml b/riocli/apply/manifests/deployment-nonros-device.yaml
index f7a4e581..3241bdb4 100644
--- a/riocli/apply/manifests/deployment-nonros-device.yaml
+++ b/riocli/apply/manifests/deployment-nonros-device.yaml
@@ -16,6 +16,13 @@ spec:
       kind: device
       nameOrGUID: device-docker
   restart: always # Options: [always, onfailure, never]
+  features:
+    params:
+      enabled: true
+      trees:
+        - config01
+        - config02
+      blockUntilSynced: true # Optional [true, false]. Default is false.
   envArgs:
     - name: TEST_KEY
       value: test_value
diff --git a/riocli/apply/manifests/deployment.yaml b/riocli/apply/manifests/deployment.yaml
index d4d21f26..5f0c43f3 100644
--- a/riocli/apply/manifests/deployment.yaml
+++ b/riocli/apply/manifests/deployment.yaml
@@ -287,6 +287,13 @@ spec:
       kind: device
       nameOrGUID: device-docker
   restart: always # Options: [always, onfailure, never]
+  features:
+    params:
+      enabled: true
+      trees:
+        - config01
+        - config02
+      blockUntilSynced: true # Optional [true, false]. Default is false.
   envArgs:
     - name: TEST_KEY
       value: test_value
diff --git a/riocli/jsonschema/schemas/deployment-schema.yaml b/riocli/jsonschema/schemas/deployment-schema.yaml
index a0659565..0d580801 100755
--- a/riocli/jsonschema/schemas/deployment-schema.yaml
+++ b/riocli/jsonschema/schemas/deployment-schema.yaml
@@ -174,8 +174,12 @@ definitions:
                           type: string
                       disableSync:
                         type: boolean
+                      blockUntilSynced:
+                        type: boolean
+                        default: false
                     required:
                       - enabled
+                      - trees
             type: object
             additionalProperties: false
 
@@ -211,6 +215,7 @@ definitions:
                         type: boolean
                     required:
                       - enabled
+                      - trees
               envArgs:
                 type: array
                 items: