diff --git a/jobs/pipelines/swarm-create-cfg-config-drive.groovy b/jobs/pipelines/swarm-create-cfg-config-drive.groovy
index f6f02bf..cdfdf75 100644
--- a/jobs/pipelines/swarm-create-cfg-config-drive.groovy
+++ b/jobs/pipelines/swarm-create-cfg-config-drive.groovy
@@ -240,7 +240,7 @@
     stage("Create config-drive"){
       // create cfg config-drive
       // apt package genisoimage is required for this stage
-      sh "./${config_drive_script_path} ${args}; touch /is_cloud_init_finished"
+      sh "./${config_drive_script_path} ${args}"
     }
 
     stage("Save artifacts") {
diff --git a/tcp_tests/managers/envmanager_devops.py b/tcp_tests/managers/envmanager_devops.py
index 17ad452..0c574a0 100644
--- a/tcp_tests/managers/envmanager_devops.py
+++ b/tcp_tests/managers/envmanager_devops.py
@@ -277,8 +277,10 @@
         self.__env.start()
         LOG.info('Environment "{0}" started'.format(self.__env.name))
         check_cloudinit_started = '[ -f /is_cloud_init_started ]'
-        check_cloudinit_finished = ('[ -f /is_cloud_init_finished ] || '
-                                    '[ -f /var/log/mcp/.bootstrap_done ]')
+        check_cloudinit_finished = (
+            '[ -f /is_cloud_init_finished ] || '
+            '[ -f /var/log/mcp/.bootstrap_done ] ||'
+            'tail -1 /var/log/cloud-init-output.log | grep "+ reboot"')
         check_cloudinit_failed = 'cat /is_cloud_init_failed'
         passed = {}
         for node in self.__env.get_nodes(role__in=underlay_node_roles):