diff --git a/.github/workflows/eden.yml b/.github/workflows/eden.yml
index a837fe8e9c..efa34f90b7 100644
--- a/.github/workflows/eden.yml
+++ b/.github/workflows/eden.yml
@@ -5,8 +5,12 @@ on:
     branches:
       - "master"
       - "[0-9]+.[0-9]+"
+    paths-ignore:
+      - 'docs/**'
   pull_request_review:
     types: [submitted]
+    paths-ignore:
+      - 'docs/**'
 
 jobs:
   integration:
@@ -17,7 +21,7 @@ jobs:
       matrix:
         tpm: ["true", "false"]
         fs: ["zfs", "ext4"]
-    if: ${{ github.event.review.state == 'approved' || github.ref == 'refs/heads/master' }}
+    if: ${{ github.event.review.state == 'approved' || github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') }}
     steps:
       - name: Check
         run: |
@@ -43,7 +47,7 @@ jobs:
           if [ -f ${{ github.workspace }}/eve/tests/eden/eden-version ]; then
             EDEN_VERSION=$(cat ${{ github.workspace }}/eve/tests/eden/eden-version)
           else
-            EDEN_VERSION=lfedge/eden:0.5.0
+            EDEN_VERSION=lfedge/eden:0.6.1
           fi
           docker run -v $PWD:/out $EDEN_VERSION cp -a /eden/. /out/
           sudo chown -R $(whoami) .
diff --git a/.github/workflows/eden_gcp.yml b/.github/workflows/eden_gcp.yml
index e77ac92add..a44ebf207a 100644
--- a/.github/workflows/eden_gcp.yml
+++ b/.github/workflows/eden_gcp.yml
@@ -87,7 +87,7 @@ jobs:
       - name: Prepare eden
         run: |
           if [ "${{ matrix.backend }}" == "rol" ] || ! [ -f ${{ github.workspace }}/eve/tests/eden/eden-version ]; then
-             EDEN_VERSION=lfedge/eden:0.5.0
+             EDEN_VERSION=lfedge/eden:0.6.1
           else
              EDEN_VERSION=$(cat ${{ github.workspace }}/eve/tests/eden/eden-version)
           fi
diff --git a/tests/eden/eclient/testdata/app_local_info.txt b/tests/eden/eclient/testdata/app_local_info.txt
index 618bb89d1c..3e9ba5065b 100644
--- a/tests/eden/eclient/testdata/app_local_info.txt
+++ b/tests/eden/eclient/testdata/app_local_info.txt
@@ -53,7 +53,7 @@ stdout 'local-manager'
 ! stderr .
 
 # STEP 2: Deploy the second app
-eden pod deploy -n app1 --memory=512MB docker://lfedge/eden-eclient:9455582 -p {{template "app_port"}}:22 --networks={{template "network"}}
+eden pod deploy -n app1 --memory=512MB docker://lfedge/eden-eclient:afaa332 -p {{template "app_port"}}:22 --networks={{template "network"}}
 test eden.app.test -test.v -timewait 10m RUNNING app1
 
 # Wait for ssh access
@@ -206,7 +206,13 @@ CMD="${3:-COMMAND_UNSPECIFIED}"
 EDEN={{EdenConfig "eden.root"}}/{{EdenConfig "eden.bin-dist"}}/{{EdenConfig "eden.eden-bin"}}
 HOST=$($EDEN eve ip)
 CONFIG="{\"displayname\": \"$DN\", \"timestamp\": $TIMESTAMP, \"command\": \"$CMD\"}"
-echo "$CONFIG" | {{template "ssh"}}$HOST -p {{template "mngr_port"}} 'cat > {{template "app_cmd_file"}}'
+
+while true; do
+    echo "$CONFIG" | {{template "ssh"}}$HOST -p {{template "mngr_port"}} 'cat > {{template "app_cmd_file"}}'
+    APP_CMD_FILE_CONTENT="$({{template "ssh"}}$HOST -p {{template "mngr_port"}} "cat {{template "app_cmd_file"}}")"
+    echo "$APP_CMD_FILE_CONTENT" | grep "$CMD" && break
+    sleep 1
+done
 
 -- wait-for-app-state.sh --
 APP="${1}"
diff --git a/tests/eden/eclient/testdata/dev_local_info.txt b/tests/eden/eclient/testdata/dev_local_info.txt
index 31c98399fa..7cda35ffc4 100644
--- a/tests/eden/eclient/testdata/dev_local_info.txt
+++ b/tests/eden/eclient/testdata/dev_local_info.txt
@@ -52,7 +52,7 @@ exec -t 10m bash get-devinfo-status.sh
 ! stderr .
 
 # STEP 2: Deploy the second app
-eden pod deploy -n app1 --memory=512MB docker://lfedge/eden-eclient:9455582 -p {{template "app_port"}}:22 --networks={{template "network"}}
+eden pod deploy -n app1 --memory=512MB docker://lfedge/eden-eclient:99d7f62 -p {{template "app_port"}}:22 --networks={{template "network"}}
 test eden.app.test -test.v -timewait 10m RUNNING app1
 
 # Wait for ssh access
@@ -85,7 +85,7 @@ exec -t 1m bash eden-pod-ps.sh local-manager
 eden controller edge-node reboot
 
 # STEP 5.1: Wait for ssh access
-test eden.app.test -test.v -timewait 20m RUNNING app1
+test eden.app.test -test.v -timewait 20m RUNNING app1 local-manager
 exec -t 10m bash wait-ssh.sh {{template "app_port"}}
 
 # STEP 5.2: Start local manager application
@@ -243,7 +243,13 @@ EDEN={{EdenConfig "eden.root"}}/{{EdenConfig "eden.bin-dist"}}/{{EdenConfig "ede
 HOST=$($EDEN eve ip)
 CONFIG="{\"command\": \"$CMD\"}"
 echo "$CONFIG"
-echo "$CONFIG" | {{template "ssh"}}$HOST -p {{template "mngr_port"}} 'cat > {{template "dev_cmd_file"}}'
+
+while true; do
+    echo "$CONFIG" | {{template "ssh"}}$HOST -p {{template "mngr_port"}} 'cat > {{template "dev_cmd_file"}}'
+    DEV_CMD_FILE_CONTENT="$({{template "ssh"}}$HOST -p {{template "mngr_port"}} "cat {{template "dev_cmd_file"}}")"
+    echo "$DEV_CMD_FILE_CONTENT" | grep "$CMD" && break
+    sleep 1
+done
 
 -- wait-for-dev-state.sh --
 EXPSTATE="${1}"
diff --git a/tests/eden/eclient/testdata/mount.txt b/tests/eden/eclient/testdata/mount.txt
index 49f170901d..0d9c0a5b39 100644
--- a/tests/eden/eclient/testdata/mount.txt
+++ b/tests/eden/eclient/testdata/mount.txt
@@ -11,12 +11,12 @@ exec chmod 600 {{EdenConfig "eden.tests"}}/eclient/image/cert/id_rsa
 # Starting of reboot detector with a 1 reboot limit
 ! test eden.reboot.test -test.v -timewait 60m -reboot=0 -count=1 &
 
-eden pod deploy -n eclient-mount --memory=512MB docker://lfedge/eden-eclient:d9eb23f -p {{$port}}:22 --mount=src=docker://nginx:1.20.0,dst=/tst --mount=src={{EdenConfig "eden.tests"}}/eclient/testdata,dst=/dir
+eden pod deploy -n eclient-mount --memory=512MB docker://lfedge/eden-eclient:d9eb23f -p {{$port}}:22 --mount=src=docker://hello-world:linux,dst=/tst --mount=src={{EdenConfig "eden.tests"}}/eclient/testdata,dst=/dir
 
 test eden.app.test -test.v -timewait 21m RUNNING eclient-mount
 
 exec -t 5m bash ssh.sh /tst
-stdout 'docker-entrypoint.sh'
+stdout 'hello'
 
 exec -t 5m bash ssh.sh /dir
 stdout 'mount.txt'
@@ -31,7 +31,7 @@ test eden.app.test -test.v -timewait 15m -check-new RUNNING eclient-mount
 
 # check old mount point
 exec -t 5m bash ssh.sh /tst
-! stdout 'docker-entrypoint.sh'
+! stdout 'hello'
 
 # mount onto another mount point
 eden volume attach eclient-mount_1_m_0 eclient-mount /dst
@@ -40,7 +40,7 @@ test eden.app.test -test.v -timewait 15m -check-new RUNNING eclient-mount
 
 # check new mount point
 exec -t 5m bash ssh.sh /dst
-stdout 'docker-entrypoint.sh'
+stdout 'hello'
 
 eden volume ls
 stdout '/dir'
@@ -51,6 +51,10 @@ eden pod delete eclient-mount
 
 test eden.app.test -test.v -timewait 10m - eclient-mount
 
+message 'Resetting of EVE'
+eden eve reset
+exec sleep 30
+
 -- eden-config.yml --
 {{/* Test's config. file */}}
 test:
diff --git a/tests/eden/eclient/testdata/radio_silence.txt b/tests/eden/eclient/testdata/radio_silence.txt
index 33f7de8654..3c84546cc5 100644
--- a/tests/eden/eclient/testdata/radio_silence.txt
+++ b/tests/eden/eclient/testdata/radio_silence.txt
@@ -51,19 +51,19 @@ eden controller edge-node update --device profile_server_token={{template "token
 eden controller edge-node update --device local_profile_server=$app_ip:8888
 
 # STEP 1: Wait for radio status
-exec -t 1m bash get-radio-status.sh
+exec -t 2m bash get-radio-status.sh
 stdout 'radio-silence=false'
 ! stderr .
 
 # STEP 2: Enable Radio-silence
 exec -t 2m bash toggle-radio-silence.sh ON
-exec -t 1m bash get-radio-status.sh
+exec -t 2m bash get-radio-status.sh
 stdout 'radio-silence=true'
 ! stderr .
 
 # STEP 3: Disable Radio-silence mode
 exec -t 2m bash toggle-radio-silence.sh OFF
-exec -t 1m bash get-radio-status.sh
+exec -t 2m bash get-radio-status.sh
 stdout 'radio-silence=false'
 ! stderr .
 
diff --git a/tests/eden/eclient/testdata/reboot_test.txt b/tests/eden/eclient/testdata/reboot_test.txt
index 025774a67e..acc5a4ffc4 100644
--- a/tests/eden/eclient/testdata/reboot_test.txt
+++ b/tests/eden/eclient/testdata/reboot_test.txt
@@ -37,7 +37,7 @@ test eden.app.test -test.v -timewait 5m HALTED {{$app_name}}
 # simulate network outage
 eden eve link down
 # sleep without networks for 7 minutes
-exec sleep 7m
+exec sleep 420
 {{end}}
 
 # check info messages sent correct data in background
diff --git a/tests/eden/eclient/testdata/shutdown_test.txt b/tests/eden/eclient/testdata/shutdown_test.txt
index 10fdd0350e..1cb153deb2 100644
--- a/tests/eden/eclient/testdata/shutdown_test.txt
+++ b/tests/eden/eclient/testdata/shutdown_test.txt
@@ -1,4 +1,5 @@
 # Test for shutdown of all app instances of EVE
+# we inject network outage and check for entities to come after reboot for qemu and vbox
 
 {{$port := "2223"}}
 {{$network_name := "n1"}}
@@ -27,6 +28,9 @@ test eden.app.test -test.v -timewait 20m RUNNING {{$app_name}}
 # check for the ZDEVICE_STATE_PREPARING_POWEROFF state
 test eden.lim.test -test.v -timewait 5m -test.run TestInfo -out InfoContent.dinfo.state 'InfoContent.dinfo.state:ZDEVICE_STATE_PREPARING_POWEROFF' &
 
+# add small sleep to not miss rare PREPARING_POWEROFF state in the background
+exec sleep 10
+
 # send shutdown command
 eden controller edge-node shutdown
 
@@ -37,17 +41,32 @@ wait
 test eden.app.test -test.v -timewait 5m HALTED {{$app_name}} &
 
 # check for the ZDEVICE_STATE_PREPARED_POWEROFF state
-test eden.lim.test -test.v -timewait 5m -test.run TestInfo -out InfoContent.dinfo.state 'InfoContent.dinfo.state:ZDEVICE_STATE_PREPARED_POWEROFF' &
+test eden.lim.test -test.v -timewait 10m -test.run TestInfo -out InfoContent.dinfo.state 'InfoContent.dinfo.state:ZDEVICE_STATE_PREPARED_POWEROFF' &
 
 # wait for detectors
 wait
 
 # now reboot node to bring app back up
-test eden.reboot.test -test.v -timewait=15m -reboot=1 -count=1 &
+test eden.reboot.test -test.v -timewait=20m -reboot=1 -count=1 &
+
+{{$devmodel := EdenConfig "eve.devmodel"}}
+
+{{if or (eq $devmodel "ZedVirtual-4G") (eq $devmodel "VBox") }}
+exec sleep 20
+# simulate network outage
+eden eve link down
+# sleep without networks for 7 minutes
+exec sleep 420
+{{end}}
 
 # check info messages sent correct data in background
-test eden.app.test -test.v -timewait 15m -check-new RUNNING {{$app_name}} &
-test eden.network.test -test.v -timewait 15m -check-new ACTIVATED {{$network_name}} &
+test eden.app.test -test.v -timewait 10m -check-new RUNNING {{$app_name}} &
+test eden.network.test -test.v -timewait 10m -check-new ACTIVATED {{$network_name}} &
+
+{{if or (eq $devmodel "ZedVirtual-4G") (eq $devmodel "VBox") }}
+# return networks
+eden eve link up
+{{end}}
 
 # wait for detectors
 wait
diff --git a/tests/eden/eclient/testdata/userdata.txt b/tests/eden/eclient/testdata/userdata.txt
index 18b3b33455..c41628660e 100644
--- a/tests/eden/eclient/testdata/userdata.txt
+++ b/tests/eden/eclient/testdata/userdata.txt
@@ -19,7 +19,7 @@ eden pod deploy -n eclient --memory=512MB docker://lfedge/eden-eclient:d9eb23f -
 
 test eden.app.test -test.v -timewait 20m RUNNING eclient
 
-exec sleep 10s
+exec sleep 10
 
 eden pod delete eclient
 
diff --git a/tests/eden/eden-version b/tests/eden/eden-version
index 4dee5e5a2c..a46e41ef07 100644
--- a/tests/eden/eden-version
+++ b/tests/eden/eden-version
@@ -1 +1 @@
-lfedge/eden:0.5.0
\ No newline at end of file
+lfedge/eden:0.6.1
\ No newline at end of file
diff --git a/tests/eden/escript/failScenario.txt b/tests/eden/escript/failScenario.txt
index 9e2a970802..3b56f77e7f 100644
--- a/tests/eden/escript/failScenario.txt
+++ b/tests/eden/escript/failScenario.txt
@@ -1,23 +1,27 @@
 {{$reset := EdenGetEnv "EDEN_FAIL_RESET"}}
 
+{{$eden_root := EdenConfig "eden.root"}}
+{{$eden_bin_dist := EdenConfig "eden.bin-dist"}}
+{{$EDEN_DIST_BIN := (printf "%s/%s" $eden_root $eden_bin_dist) }}
+
 /bin/echo Default test fail scenario
 
 /bin/echo eden status
-eden status
+{{$EDEN_DIST_BIN}}/eden status
 /bin/echo eden pod ps
-eden pod ps
+{{$EDEN_DIST_BIN}}/eden pod ps
 /bin/echo eden network ls
-eden network ls
+{{$EDEN_DIST_BIN}}/eden network ls
 /bin/echo eden volume ls
-eden volume ls
+{{$EDEN_DIST_BIN}}/eden volume ls
 
 # stay for 10 seconds to keep additional logs
 /bin/sleep 10
 
 /bin/echo check fatal_stacks in logs
-eden log --format=json content:fatal_stacks
+{{$EDEN_DIST_BIN}}/eden log --format=json content:fatal_stacks
 
 {{ if (ne $reset "") }}
 /bin/echo EDEN's reset
-eden.escript.test -test.run TestEdenScripts/eden_reset -testdata {{EdenConfig "eden.root"}}/../tests/workflow/testdata/
+{{$EDEN_DIST_BIN}}/eden.escript.test -test.run TestEdenScripts/eden_reset -testdata {{EdenConfig "eden.root"}}/../tests/workflow/testdata/
 {{end}}
diff --git a/tests/eden/escript/testdata/time.txt b/tests/eden/escript/testdata/time.txt
index 367af35433..5a2ef4542b 100644
--- a/tests/eden/escript/testdata/time.txt
+++ b/tests/eden/escript/testdata/time.txt
@@ -1,4 +1,4 @@
-exec sleep 5s
-! exec -t 5s sleep 10s
-exec -t 10s sleep 5s
-exec sleep 15s
+exec sleep 5
+! exec -t 5s sleep 10
+exec -t 10s sleep 5
+exec sleep 15
diff --git a/tests/eden/workflow/eden.workflow.tests.txt b/tests/eden/workflow/eden.workflow.tests.txt
index a30acbd1b7..f625d5765a 100644
--- a/tests/eden/workflow/eden.workflow.tests.txt
+++ b/tests/eden/workflow/eden.workflow.tests.txt
@@ -178,15 +178,14 @@ eden.escript.test -testdata ../eclient/testdata/ -test.run TestEdenScripts/app_n
 eden.escript.test -testdata ../eclient/testdata/ -test.run TestEdenScripts/eclients
 {{end}}
 
-/bin/echo Eden Reboot test (34/{{$tests}})
-eden.escript.test -testdata ../eclient/testdata/ -test.run TestEdenScripts/reboot_test
-
-/bin/echo Eden Shutdown test (34.1/{{$tests}})
+/bin/echo Eden Shutdown test (34/{{$tests}})
 eden.escript.test -testdata ../eclient/testdata/ -test.run TestEdenScripts/shutdown_test
 
 {{ if ne $workflow "small" }}
+{{ if or (eq $workflow "large") (eq $workflow "gcp") }}
 /bin/echo Eden base OS update http (35/{{$tests}})
 eden.escript.test -testdata ../update_eve_image/testdata/ -test.run TestEdenScripts/update_eve_image_http
+{{end}}
 /bin/echo Eden base OS update oci (36/{{$tests}})
 eden.escript.test -testdata ../update_eve_image/testdata/ -test.run TestEdenScripts/update_eve_image_oci
 {{end}}