diff --git a/gui/pages/Content/Agents/AgentCreate.js b/gui/pages/Content/Agents/AgentCreate.js
index eb51abe22..f8179b2cb 100644
--- a/gui/pages/Content/Agents/AgentCreate.js
+++ b/gui/pages/Content/Agents/AgentCreate.js
@@ -5,6 +5,7 @@ import 'react-toastify/dist/ReactToastify.css';
 import styles from './Agents.module.css';
 import {
   createAgent,
+  editAgentTemplate,
   fetchAgentTemplateConfigLocal,
   getOrganisationConfig,
   updateExecution,
@@ -32,6 +33,7 @@ export default function AgentCreate({
                                     }) {
   const [advancedOptions, setAdvancedOptions] = useState(false);
   const [agentName, setAgentName] = useState("");
+  const [agentTemplateId, setAgentTemplateId] = useState(null);
   const [agentDescription, setAgentDescription] = useState("");
   const [longTermMemory, setLongTermMemory] = useState(true);
   const [addResources, setAddResources] = useState(true);
@@ -42,6 +44,7 @@ export default function AgentCreate({
   const [maxIterations, setIterations] = useState(25);
   const [toolkitList, setToolkitList] = useState(toolkits)
   const [searchValue, setSearchValue] = useState('');
+  const [showButton, setShowButton] = useState(false);
 
   const constraintsArray = [
     "If you are unsure how you previously did something or want to recall past events, thinking about similar events will help you remember.",
@@ -132,6 +135,7 @@ export default function AgentCreate({
       setLocalStorageValue("agent_name_" + String(internalId), template.name, setAgentName);
       setLocalStorageValue("agent_description_" + String(internalId), template.description, setAgentDescription);
       setLocalStorageValue("advanced_options_" + String(internalId), true, setAdvancedOptions);
+      setLocalStorageValue("agent_template_id_" + String(internalId), template.id, setAgentTemplateId);
 
       fetchAgentTemplateConfigLocal(template.id)
         .then((response) => {
@@ -146,6 +150,8 @@ export default function AgentCreate({
           setLocalStorageValue("agent_database_" + String(internalId), data.LTM_DB, setDatabase);
           setLocalStorageValue("agent_model_" + String(internalId), data.model, setModel);
           setLocalStorageArray("tool_names_" + String(internalId), data.tools, setToolNames);
+          setLocalStorageValue("is_agent_template_" + String(internalId), true, setShowButton);
+          setShowButton(true);
         })
         .catch((error) => {
           console.error('Error fetching template details:', error);
@@ -357,33 +363,35 @@ export default function AgentCreate({
     }
   }, [scheduleData]);
 
-  const handleAddAgent = () => {
-    if (!hasAPIkey) {
+  const validateAgentData = (isNewAgent) => {
+    if (isNewAgent && !hasAPIkey) {
       toast.error("Your OpenAI/Palm API key is empty!", {autoClose: 1800});
       openNewTab(-3, "Settings", "Settings", false);
-      return
+      return false;
     }
-
+  
     if (agentName.replace(/\s/g, '') === '') {
       toast.error("Agent name can't be blank", {autoClose: 1800});
-      return
+      return false;
     }
-
     if (agentDescription.replace(/\s/g, '') === '') {
       toast.error("Agent description can't be blank", {autoClose: 1800});
-      return
+      return false;
     }
-
     const isEmptyGoal = goals.some((goal) => goal.replace(/\s/g, '') === '');
     if (isEmptyGoal) {
       toast.error("Goal can't be empty", {autoClose: 1800});
-      return;
+      return false;
     }
-
     if (selectedTools.length <= 0) {
       toast.error("Add atleast one tool", {autoClose: 1800});
-      return
+      return false;
     }
+    return true;
+  }
+
+  const handleAddAgent = () => {
+    if (!validateAgentData(true)) return;
 
     setCreateClickable(false);
 
@@ -526,6 +534,46 @@ export default function AgentCreate({
     event.preventDefault();
   };
 
+  function updateTemplate() {
+
+    if (!validateAgentData(false)) return;
+
+    let permission_type = permission;
+    if (permission.includes("RESTRICTED")) {
+      permission_type = "RESTRICTED";
+    }
+
+    const agentTemplateConfigData = {
+      "goal": goals,
+      "instruction": instructions,
+      "agent_type": agentType,
+      "constraints": constraints,
+      "tools": toolNames,
+      "exit": exitCriterion,
+      "iteration_interval": stepTime,
+      "model": model,
+      "max_iterations": maxIterations,
+      "permission_type": permission_type,
+      "LTM_DB": longTermMemory ? database : null,
+    }
+    const editTemplateData = {
+      "name": agentName,
+      "description": agentDescription,
+      "agent_configs": agentTemplateConfigData
+    }
+
+    editAgentTemplate(agentTemplateId, editTemplateData)
+      .then((response) => {
+        if (response.status === 200) {
+          toast.success('Agent template has been updated successfully!', {autoClose: 1800});
+        }
+      })
+      .catch((error) => {
+        toast.error("Error updating agent template")
+        console.error('Error updating agent template:', error);
+      });
+  };
+
   function setFileData(files) {
     if (files.length > 0) {
       const fileData = {
@@ -574,11 +622,21 @@ export default function AgentCreate({
         setAdvancedOptions(JSON.parse(advanced_options));
       }
 
+      const is_agent_template = localStorage.getItem("is_agent_template_" + String(internalId));
+      if (is_agent_template) {
+        setShowButton(true);
+      }
+
       const agent_name = localStorage.getItem("agent_name_" + String(internalId));
       if (agent_name) {
         setAgentName(agent_name);
       }
 
+      const agent_template_id = localStorage.getItem("agent_template_id_"+ String(internalId));
+      if(agent_template_id){
+        setAgentTemplateId(agent_template_id)
+      }
+
       const agent_description = localStorage.getItem("agent_description_" + String(internalId));
       if (agent_description) {
         setAgentDescription(agent_description);
@@ -981,6 +1039,12 @@ export default function AgentCreate({
             <button style={{marginRight: '7px'}} className="secondary_button"
                     onClick={() => removeTab(-1, "new agent", "Create_Agent", internalId)}>Cancel
             </button>
+            {showButton && (
+              <button style={{ marginRight: '7px' }} className="secondary_button"
+              onClick={() => {updateTemplate()}}>
+                Update Template
+              </button>
+            )}
             <div style={{display: 'flex', position: 'relative'}}>
               {createDropdown && (<div className="custom_select_option" style={{
                 background: '#3B3B49',
diff --git a/gui/pages/api/DashboardService.js b/gui/pages/api/DashboardService.js
index 6eaf9a9c7..0ffdecd00 100644
--- a/gui/pages/api/DashboardService.js
+++ b/gui/pages/api/DashboardService.js
@@ -56,6 +56,10 @@ export const updateExecution = (executionId, executionData) => {
   return api.put(`/agentexecutions/update/${executionId}`, executionData);
 };
 
+export const editAgentTemplate = (agentTemplateId, agentTemplateData) => {
+  return api.put(`/agent_templates/edit_agent_template/${agentTemplateId}`, agentTemplateData)
+}
+
 export const addExecution = (executionData) => {
   return api.post(`/agentexecutions/add`, executionData);
 };
diff --git a/superagi/controllers/agent_template.py b/superagi/controllers/agent_template.py
index 6e59faa87..1bcb960a1 100644
--- a/superagi/controllers/agent_template.py
+++ b/superagi/controllers/agent_template.py
@@ -170,10 +170,8 @@ def edit_agent_template(agent_template_id: int,
     if db_agent_template is None:
         raise HTTPException(status_code=404, detail="Agent Template not found")
     
-    if "name" in edited_agent_configs:
-        db_agent_template.name = edited_agent_configs["name"]
-    if "description" in edited_agent_configs:
-        db_agent_template.description = edited_agent_configs["description"]
+    db_agent_template.name = edited_agent_configs["name"]
+    db_agent_template.description = edited_agent_configs["description"]
 
     db.session.commit()