diff --git a/examples/actor/README.md b/examples/actor/README.md
index 1fb5d05..4fb5737 100644
--- a/examples/actor/README.md
+++ b/examples/actor/README.md
@@ -21,6 +21,7 @@ expected_stdout_lines:
   - '== APP == receive reminder =  testReminderName  state =  "hello" duetime =  5s period =  5s'
 background: true
 sleep: 30
+timeout_seconds: 60
 -->
 
 ```bash
@@ -54,6 +55,7 @@ expected_stdout_lines:
 
 background: true
 sleep: 40
+timeout_seconds: 60
 -->
 
 ```bash
@@ -67,20 +69,11 @@ dapr run --app-id actor-client \
 
 ### Cleanup
 
-<!-- STEP
-expected_stdout_lines: 
-  - '✅  app stopped successfully: actor-serving'
-expected_stderr_lines:
-name: Shutdown dapr
--->
-
 ```bash
 dapr stop --app-id  actor-serving
 (lsof -i:8080 | grep main) | awk '{print $2}' | xargs  kill
 ```
 
-<!-- END_STEP -->
-
 ## Result
 - client side
 ```
@@ -108,4 +101,4 @@ dapr stop --app-id  actor-serving
 == APP == get req =  hello
 == APP == receive reminder =  testReminderName  state =  "hello" duetime =  5s period =  5s
 == APP == receive reminder =  testReminderName  state =  "hello" duetime =  5s period =  5s
-```
\ No newline at end of file
+```
diff --git a/examples/configuration/README.md b/examples/configuration/README.md
index d33760c..f011200 100644
--- a/examples/configuration/README.md
+++ b/examples/configuration/README.md
@@ -26,6 +26,7 @@ expected_stdout_lines:
   - '== APP == dapr configuration subscribe finished.'
 background: false
 sleep: 40
+timeout_seconds: 60
 -->
 
 ```bash
diff --git a/examples/grpc-service/README.md b/examples/grpc-service/README.md
index 980b585..61c3bf0 100644
--- a/examples/grpc-service/README.md
+++ b/examples/grpc-service/README.md
@@ -18,6 +18,7 @@ expected_stdout_lines:
   - 'Received: Dapr'
 background: true
 sleep: 30
+timeout_seconds: 60
 -->
 
 ```bash
@@ -39,6 +40,7 @@ expected_stdout_lines:
 output_match_mode: substring
 background: true
 sleep: 15
+timeout_seconds: 60
 -->
 
 ```bash
@@ -50,15 +52,6 @@ dapr run --app-id grpc-client \
 
 ### Cleanup
 
-<!-- STEP
-expected_stdout_lines:
-  - '✅  app stopped successfully: grpc-server'
-expected_stderr_lines:
-name: Shutdown dapr
--->
-
 ```bash
 dapr stop --app-id grpc-server
 ```
-
-<!-- END_STEP -->
diff --git a/examples/hello-world/README.md b/examples/hello-world/README.md
index 6ab34b5..db1d339 100644
--- a/examples/hello-world/README.md
+++ b/examples/hello-world/README.md
@@ -82,6 +82,7 @@ There are two ways to launch Dapr applications. You can pass the app executable
 name: Run and send order
 background: true
 sleep: 5
+timeout_seconds: 60
 expected_stdout_lines:
   - '== APP == dapr client initializing for: 127.0.0.1:3500'
   - '== APP == Sending order ID 20'
@@ -98,6 +99,7 @@ dapr run --app-id order-app --dapr-grpc-port 3500 --log-level error -- ./order p
 name: Run and get order
 background: true
 sleep: 5
+timeout_seconds: 60
 expected_stdout_lines:
   - '== APP == dapr client initializing for: 127.0.0.1:3500'
   - '== APP == Getting order'
diff --git a/examples/pubsub/README.md b/examples/pubsub/README.md
index d3e9231..2d841ad 100644
--- a/examples/pubsub/README.md
+++ b/examples/pubsub/README.md
@@ -21,6 +21,7 @@ expected_stdout_lines:
   - 'event - PubsubName: messages, Topic: neworder'
 background: true
 sleep: 15
+timeout_seconds: 60
 -->
 
 ```bash
@@ -43,6 +44,7 @@ expected_stdout_lines:
   - '== APP == data published'
 background: true
 sleep: 15
+timeout_seconds: 60
 -->
 
 ```bash
@@ -58,20 +60,11 @@ dapr run --app-id pub \
 
 ### Cleanup
 
-<!-- STEP
-expected_stdout_lines: 
-  - '✅  app stopped successfully: sub'
-expected_stderr_lines:
-name: Shutdown dapr
--->
-
 ```bash
 dapr stop --app-id sub
 (lsof -i:8080 | grep sub) | awk '{print $2}' | xargs  kill
 ```
 
-<!-- END_STEP -->
-
 ## Result
 
 ```shell
diff --git a/examples/service/README.md b/examples/service/README.md
index c7b3af3..7a536b6 100644
--- a/examples/service/README.md
+++ b/examples/service/README.md
@@ -17,6 +17,7 @@ expected_stdout_lines:
   - "ContentType:text/plain, Verb:POST, QueryString:, hellow"
 background: true
 sleep: 15
+timeout_seconds: 60
 -->
 
 ```bash
@@ -60,6 +61,7 @@ expected_stdout_lines:
   - '== APP == output binding invoked'
 background: true
 sleep: 15
+timeout_seconds: 60
 -->
 
 ```bash
@@ -155,17 +157,7 @@ Uses the [config/cron.yaml](config/cron.yaml) component
 
 ### Cleanup
 
-<!-- STEP
-expected_stdout_lines: 
-  - '✅  app stopped successfully: serving'
-expected_stderr_lines:
-name: Shutdown dapr
--->
-
 ```bash
 dapr stop --app-id serving
 (lsof -i:8080 | grep main) | awk '{print $2}' | xargs  kill
 ```
-
-<!-- END_STEP -->
-
diff --git a/examples/socket/README.md b/examples/socket/README.md
index 64536f7..534066c 100644
--- a/examples/socket/README.md
+++ b/examples/socket/README.md
@@ -70,6 +70,7 @@ There are two ways to launch Dapr applications. You can pass the app executable
 name: Run and send order
 background: true
 sleep: 5
+timeout_seconds: 60
 expected_stdout_lines:
   - '== APP == dapr client initializing for: /tmp/dapr-order-app-grpc.socket'
   - '== APP == Sending order ID 20'
@@ -86,6 +87,7 @@ dapr run --app-id order-app --log-level error --unix-domain-socket /tmp -- ./ord
 name: Run and get order
 background: true
 sleep: 5
+timeout_seconds: 60
 expected_stdout_lines:
   - '== APP == dapr client initializing for: /tmp/dapr-order-app-grpc.socket'
   - '== APP == Getting order'
diff --git a/examples/workflow-parallel/README.md b/examples/workflow-parallel/README.md
index 337e24b..f6ed992 100644
--- a/examples/workflow-parallel/README.md
+++ b/examples/workflow-parallel/README.md
@@ -23,6 +23,7 @@ expected_stdout_lines:
 
 background: true
 sleep: 30
+timeout_seconds: 60
 -->
 
 ```bash
diff --git a/examples/workflow/README.md b/examples/workflow/README.md
index d962e5e..85e01e7 100644
--- a/examples/workflow/README.md
+++ b/examples/workflow/README.md
@@ -40,6 +40,7 @@ expected_stdout_lines:
 
 background: true
 sleep: 60
+timeout_seconds: 60
 -->
 
 ```bash