diff --git a/packages/apps/tiny-erp/src/integration/parsers/order-to-tiny.ts b/packages/apps/tiny-erp/src/integration/parsers/order-to-tiny.ts
index 5dd23e673..3abe18b17 100644
--- a/packages/apps/tiny-erp/src/integration/parsers/order-to-tiny.ts
+++ b/packages/apps/tiny-erp/src/integration/parsers/order-to-tiny.ts
@@ -83,6 +83,10 @@ export default async (order: Orders, appData) => {
     if (shippingAddress.name) {
       tinyOrder.endereco_entrega.nome_destinatario = shippingAddress.name.substring(0, 60);
     }
+    if (buyer && buyer.doc_number && buyer.doc_number.length <= 18) {
+      tinyOrder.endereco_entrega.cpf_cnpj = buyer.doc_number;
+      tinyOrder.endereco_entrega.tipo_pessoa = buyer.registry_type === 'j' ? 'J' : 'F';
+    }
   }
 
   if (order.items) {
diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts
index 054c8097b..e341b27d8 100644
--- a/packages/cli/src/cli.ts
+++ b/packages/cli/src/cli.ts
@@ -80,11 +80,35 @@ const run = async () => {
         const baseFirebaseConfig = JSON.parse(
           fs.readFileSync(joinPath(baseConfigDir, 'firebase.json'), 'utf8'),
         );
-        const mergedConfig = deepmerge(baseFirebaseConfig, userFirebaseConfig);
-        fs.writeFileSync(
-          joinPath(pwd, 'firebase.json'),
-          JSON.stringify(mergedConfig, null, 2),
-        );
+        const userRewrites: Array<Record<string, any>> | undefined = userFirebaseConfig?.hosting?.rewrites;
+        if (Array.isArray(userRewrites) && Array.isArray(baseFirebaseConfig.hosting?.rewrites)) {
+          const hostingRest: Record<string, any> = { ...userFirebaseConfig.hosting };
+          delete hostingRest.rewrites;
+          const mergedConfig = deepmerge(baseFirebaseConfig, {
+            ...userFirebaseConfig,
+            hosting: hostingRest,
+          });
+          const mergedRewrites: Array<Record<string, any>> = [...baseFirebaseConfig.hosting.rewrites];
+          userRewrites.forEach((userRewrite) => {
+            const matchIdx = mergedRewrites.findIndex((r) => r.function === userRewrite.function);
+            if (matchIdx >= 0) {
+              mergedRewrites[matchIdx] = { ...mergedRewrites[matchIdx], ...userRewrite };
+            } else {
+              mergedRewrites.push(userRewrite);
+            }
+          });
+          mergedConfig.hosting.rewrites = mergedRewrites;
+          fs.writeFileSync(
+            joinPath(pwd, 'firebase.json'),
+            JSON.stringify(mergedConfig, null, 2),
+          );
+        } else {
+          const mergedConfig = deepmerge(baseFirebaseConfig, userFirebaseConfig);
+          fs.writeFileSync(
+            joinPath(pwd, 'firebase.json'),
+            JSON.stringify(mergedConfig, null, 2),
+          );
+        }
       }
     }
   }
diff --git a/packages/feeds/src/firebase/serve-feeds.ts b/packages/feeds/src/firebase/serve-feeds.ts
index 350d8ac31..ae5df08c6 100644
--- a/packages/feeds/src/firebase/serve-feeds.ts
+++ b/packages/feeds/src/firebase/serve-feeds.ts
@@ -106,10 +106,6 @@ const serveFeeds = async (req: Request, res: Response) => {
     }
   }
   switch (req.path) {
-    case '/_feeds/catalog.xml':
-    case '/catalog.xml':
-      await renderCatalog(req, res, products);
-      break;
     case '/sitemap-catalog.xml':
       await renderSitemap(req, res, products);
       break;
@@ -122,6 +118,10 @@ const serveFeeds = async (req: Request, res: Response) => {
         await proxyGithubApi(req, res);
         break;
       }
+      if (req.path.endsWith('/catalog.xml')) {
+        await renderCatalog(req, res, products);
+        break;
+      }
       res.sendStatus(404);
   }
 };