diff --git a/docker2fl/src/docker2fl.rs b/docker2fl/src/docker2fl.rs
index 19d20d3..77bb439 100644
--- a/docker2fl/src/docker2fl.rs
+++ b/docker2fl/src/docker2fl.rs
@@ -230,12 +230,14 @@ async fn container_boot(
         }
     }
 
-    if container_config.working_dir.is_some() {
-        cwd = container_config.working_dir.unwrap();
+    let working_dir = container_config.working_dir.unwrap();
+    if !working_dir.is_empty() {
+        cwd = working_dir;
     }
 
     let metadata = json!({
         "startup": {
+            "": "",
             "entry": {
                 "name": "core.system",
                 "args": {
@@ -250,6 +252,11 @@ async fn container_boot(
 
     let toml_metadata: toml::Value = serde_json::from_str(&metadata.to_string())?;
 
+    log::info!(
+        "Creating '.startup.toml' file from container {:?}",
+        toml_metadata
+    );
+    
     log::debug!(
         "Creating '.startup.toml' file from container {}",
         container_name