diff --git a/templates/ag2/default/runagent.config.json b/templates/ag2/default/runagent.config.json
index a3683cc..32eb128 100644
--- a/templates/ag2/default/runagent.config.json
+++ b/templates/ag2/default/runagent.config.json
@@ -23,6 +23,7 @@
         "tag": "ag2_stream"
       }
     ]
-  }
+  },
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
 
diff --git a/templates/agno/default/runagent.config.json b/templates/agno/default/runagent.config.json
index bfe717e..510c909 100644
--- a/templates/agno/default/runagent.config.json
+++ b/templates/agno/default/runagent.config.json
@@ -23,6 +23,7 @@
         "tag": "agno_print_response_stream"
       }
     ]
-  }
+  },
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
 
diff --git a/templates/autogen/default/runagent.config.json b/templates/autogen/default/runagent.config.json
index 6af1de3..23fb920 100644
--- a/templates/autogen/default/runagent.config.json
+++ b/templates/autogen/default/runagent.config.json
@@ -37,6 +37,7 @@
         }
       }
     ]
-  }
+  },
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
 
diff --git a/templates/crewai/default/runagent.config.json b/templates/crewai/default/runagent.config.json
index cab905d..2d66d7c 100644
--- a/templates/crewai/default/runagent.config.json
+++ b/templates/crewai/default/runagent.config.json
@@ -26,6 +26,7 @@
         }
       }
     ]
-  }
+  },
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
 
diff --git a/templates/default/default/runagent.config.json b/templates/default/default/runagent.config.json
index 82bcbb4..e57e94e 100644
--- a/templates/default/default/runagent.config.json
+++ b/templates/default/default/runagent.config.json
@@ -23,5 +23,6 @@
         "tag": "minimal"
       }
     ]
-  } 
+  },
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
\ No newline at end of file
diff --git a/templates/langchain/chatbot/runagent.config.json b/templates/langchain/chatbot/runagent.config.json
index b94a16b..009765b 100644
--- a/templates/langchain/chatbot/runagent.config.json
+++ b/templates/langchain/chatbot/runagent.config.json
@@ -18,5 +18,6 @@
         "tag": "generic"
       }
     ]
-  }
+  },
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
\ No newline at end of file
diff --git a/templates/langchain/default/runagent.config.json b/templates/langchain/default/runagent.config.json
index 3a2dea3..7a4d379 100644
--- a/templates/langchain/default/runagent.config.json
+++ b/templates/langchain/default/runagent.config.json
@@ -24,5 +24,6 @@
 
       }
     ]
-  }
+  },
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
\ No newline at end of file
diff --git a/templates/langgraph/advanced/runagent.config.json b/templates/langgraph/advanced/runagent.config.json
index 271b6b6..43ae422 100644
--- a/templates/langgraph/advanced/runagent.config.json
+++ b/templates/langgraph/advanced/runagent.config.json
@@ -23,5 +23,6 @@
         "tag": "generic_stream"
       }
     ]
-  }
+  },
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
\ No newline at end of file
diff --git a/templates/langgraph/default/runagent.config.json b/templates/langgraph/default/runagent.config.json
index d7939a4..6562bff 100644
--- a/templates/langgraph/default/runagent.config.json
+++ b/templates/langgraph/default/runagent.config.json
@@ -23,5 +23,6 @@
         "tag": "generic_stream"
       }
     ]
-  }
+  },
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
\ No newline at end of file
diff --git a/templates/langgraph/problem_solver_advanced/runagent.config.json b/templates/langgraph/problem_solver_advanced/runagent.config.json
index 209c9c5..cb29435 100644
--- a/templates/langgraph/problem_solver_advanced/runagent.config.json
+++ b/templates/langgraph/problem_solver_advanced/runagent.config.json
@@ -23,5 +23,6 @@
         "tag": "generic_stream"
       }
     ]
-  }
+  },
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
\ No newline at end of file
diff --git a/templates/letta/advanced/runagent.config.json b/templates/letta/advanced/runagent.config.json
index e43aa9e..f845f09 100644
--- a/templates/letta/advanced/runagent.config.json
+++ b/templates/letta/advanced/runagent.config.json
@@ -23,5 +23,6 @@
         "tag": "basic_stream"
       }
     ]
-  }
+  },
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
\ No newline at end of file
diff --git a/templates/letta/default/runagent.config.json b/templates/letta/default/runagent.config.json
index aa202e0..380c8f6 100644
--- a/templates/letta/default/runagent.config.json
+++ b/templates/letta/default/runagent.config.json
@@ -23,5 +23,6 @@
         "tag": "astrology_stream"
       }
     ]
-  }
+  },
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
\ No newline at end of file
diff --git a/templates/letta/rag/runagent.config.json b/templates/letta/rag/runagent.config.json
index e43aa9e..f845f09 100644
--- a/templates/letta/rag/runagent.config.json
+++ b/templates/letta/rag/runagent.config.json
@@ -23,5 +23,6 @@
         "tag": "basic_stream"
       }
     ]
-  }
+  },
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
\ No newline at end of file
diff --git a/templates/llamaindex/__init__.py b/templates/llamaindex/__init__.py
deleted file mode 100644
index 4e92c59..0000000
--- a/templates/llamaindex/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from .advanced.template import LlamaIndexAdvancedTemplate
-from .basic.template import LlamaIndexBasicTemplate
diff --git a/templates/llamaindex/default/runagent.config.json b/templates/llamaindex/default/runagent.config.json
index f77be5b..00a4d0a 100644
--- a/templates/llamaindex/default/runagent.config.json
+++ b/templates/llamaindex/default/runagent.config.json
@@ -23,5 +23,6 @@
         "tag": "math_stream"
       }
     ]
-  }
+  },
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
\ No newline at end of file
diff --git a/templates/n8n/default/runagent.config.json b/templates/n8n/default/runagent.config.json
index 457a827..68152bd 100644
--- a/templates/n8n/default/runagent.config.json
+++ b/templates/n8n/default/runagent.config.json
@@ -19,5 +19,6 @@
         "tag": "food_doctor"
       }
     ]
-  }
+  },
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
\ No newline at end of file
diff --git a/templates/openai/default/runagent.config.json b/templates/openai/default/runagent.config.json
index 26c6096..951baf8 100644
--- a/templates/openai/default/runagent.config.json
+++ b/templates/openai/default/runagent.config.json
@@ -41,7 +41,5 @@
       }
     ]
   },
-  "env_vars": {
-    "OPENAI_API_KEY": "sk-proj-1234567890"
-  }
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
\ No newline at end of file
diff --git a/templates/openai/email_agent/runagent.config.json b/templates/openai/email_agent/runagent.config.json
index 5b0a8b8..da6962b 100644
--- a/templates/openai/email_agent/runagent.config.json
+++ b/templates/openai/email_agent/runagent.config.json
@@ -24,7 +24,5 @@
       }
     ]
   },
-  "env_vars": {
-    "OPENAI_API_KEY": "sk-proj-1234567890"
-  }
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
\ No newline at end of file
diff --git a/templates/parlant/default/runagent.config.json b/templates/parlant/default/runagent.config.json
index 9180521..b135782 100644
--- a/templates/parlant/default/runagent.config.json
+++ b/templates/parlant/default/runagent.config.json
@@ -24,8 +24,5 @@
       }
     ]
   },
-  "env_vars": {
-    "OPENAI_API_KEY": "",
-    "PARLANT_LOG_LEVEL": "INFO"
-  }
+  "agent_id": "00000000-0000-0000-0000-000000000000"
 }
\ No newline at end of file