diff --git a/jobs/pipelines/swarm-create-cfg-config-drive.groovy b/jobs/pipelines/swarm-create-cfg-config-drive.groovy
index 6032b77..f6f02bf 100644
--- a/jobs/pipelines/swarm-create-cfg-config-drive.groovy
+++ b/jobs/pipelines/swarm-create-cfg-config-drive.groovy
@@ -135,7 +135,7 @@
         if (version in ['2018.8.0']){
           user_data_script_path = "mcp-common-scripts-git/config-drive/master_config.sh"
         } else {
-        user_data_script_path = "mcp-common-scripts-git/config-drive/master_config.yaml"
+          user_data_script_path = "mcp-common-scripts-git/config-drive/master_config.yaml"
         }
         sh "chmod +x ${config_drive_script_path}"
 
@@ -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}"
+      sh "./${config_drive_script_path} ${args}; touch /is_cloud_init_finished"
     }
 
     stage("Save artifacts") {