diff --git a/packages/shared/database/src/tenant-provisioning.service.ts b/packages/shared/database/src/tenant-provisioning.service.ts
index 3115616..5da913a 100644
--- a/packages/shared/database/src/tenant-provisioning.service.ts
+++ b/packages/shared/database/src/tenant-provisioning.service.ts
@@ -28,11 +28,16 @@ export class TenantProvisioningService {
       let sql = fs.readFileSync(templatePath, 'utf-8');
       sql = sql.replace(/{TENANT_ID}/g, tenantId);
 
-      // Split by semicolon and execute statements individually
-      const statements = sql
+      // Remove comment lines, then split by semicolon
+      const cleanedSql = sql
+        .split('\n')
+        .filter((line) => !line.trimStart().startsWith('--'))
+        .join('\n');
+
+      const statements = cleanedSql
         .split(';')
         .map((s) => s.trim())
-        .filter((s) => s.length > 0 && !s.startsWith('--'));
+        .filter((s) => s.length > 0);
 
       for (const stmt of statements) {
         await queryRunner.query(stmt);