diff --git a/backend/src/build-system/handlers/database/schemas/prompt.ts b/backend/src/build-system/handlers/database/schemas/prompt.ts
index c6a617cb..524b5006 100644
--- a/backend/src/build-system/handlers/database/schemas/prompt.ts
+++ b/backend/src/build-system/handlers/database/schemas/prompt.ts
@@ -131,9 +131,7 @@ Your reply must start with "<GENERATE>" and end with "</GENERATE>".`;
   ): string => {
     return `You are a Database Expert specializing in ${databaseType}. Your task is to analyze and fix any issues in the following database schema:
   
-  <GENERATE>
   ${schemaContent}
-  </GENERATE>
   
   As an expert database engineer, you should:
   1. Analyze the schema for any syntax errors, logical inconsistencies, or missing elements
diff --git a/backend/src/build-system/handlers/database/schemas/schemas.ts b/backend/src/build-system/handlers/database/schemas/schemas.ts
index ba01a3bf..fda7b701 100644
--- a/backend/src/build-system/handlers/database/schemas/schemas.ts
+++ b/backend/src/build-system/handlers/database/schemas/schemas.ts
@@ -116,7 +116,7 @@ export class DBSchemaHandler implements BuildHandler {
               {
                 role: 'user',
                 content:
-                  'help me fix my schema code if there is any failed validation',
+                  'help me fix my schema code if there is any failed validation, generate full validated version schemas for me, with <GENERATE></GENERATE> xml tag',
               },
             ],
           },
diff --git a/backend/src/build-system/handlers/frontend-code-generate/index.ts b/backend/src/build-system/handlers/frontend-code-generate/index.ts
index 5fa6caf9..419db5a1 100644
--- a/backend/src/build-system/handlers/frontend-code-generate/index.ts
+++ b/backend/src/build-system/handlers/frontend-code-generate/index.ts
@@ -193,8 +193,8 @@ export class FrontendCodeHandler implements BuildHandler<string> {
                 content: `Dependencies:
                 
                   ${dependenciesText}\n
-                  Now you can provide the code.
-                  `,
+                  Now you can provide the code, don't forget the <GENERATE></GENERATE> xml tags.
+,                  `,
               },
             ] as MessageInterface[];