diff --git a/packages/bruno-app/src/components/EnvironmentVariablesTable/index.js b/packages/bruno-app/src/components/EnvironmentVariablesTable/index.js
index 988f388f7..f0fe61904 100644
--- a/packages/bruno-app/src/components/EnvironmentVariablesTable/index.js
+++ b/packages/bruno-app/src/components/EnvironmentVariablesTable/index.js
@@ -477,7 +477,7 @@ const EnvironmentVariablesTable = ({
                     id={`${actualIndex}.name`}
                     name={`${actualIndex}.name`}
                     value={variable.name}
-                    placeholder={!variable.value || (typeof variable.value === 'string' && variable.value.trim() === '') ? 'Value' : ''}
+                    placeholder={!variable.value || (typeof variable.value === 'string' && variable.value.trim() === '') ? 'Name' : ''}
                     onChange={(e) => handleNameChange(actualIndex, e)}
                     onBlur={() => handleNameBlur(actualIndex)}
                     onKeyDown={(e) => handleNameKeyDown(actualIndex, e)}
diff --git a/packages/bruno-app/src/utils/exporters/bruno-environment.js b/packages/bruno-app/src/utils/exporters/bruno-environment.js
index 6b8fcc723..f5c660b78 100644
--- a/packages/bruno-app/src/utils/exporters/bruno-environment.js
+++ b/packages/bruno-app/src/utils/exporters/bruno-environment.js
@@ -7,7 +7,7 @@ export const exportBrunoEnvironment = async ({ environments, environmentType, fi
     let cleanEnvironments = environments.map((environment) => ({
       name: environment.name,
       variables: (environment.variables || []).map((envVariable) => buildEnvVariable({ envVariable })),
-      color: environment.color
+      color: environment.color ?? undefined
     }));
 
     await ipcRenderer.invoke('renderer:export-environment', {
diff --git a/packages/bruno-cli/src/utils/collection.js b/packages/bruno-cli/src/utils/collection.js
index 9d06ee54e..ec5d8dae0 100644
--- a/packages/bruno-cli/src/utils/collection.js
+++ b/packages/bruno-cli/src/utils/collection.js
@@ -457,7 +457,7 @@ const createCollectionFromBrunoObject = async (collection, dirPath) => {
 
   // Create collection.bru if root exists
   if (collection.root) {
-    const collectionContent = await stringifyCollection(collection.root);
+    const collectionContent = await stringifyCollection(collection.root, {}, { format: 'bru' });
     fs.writeFileSync(path.join(dirPath, 'collection.bru'), collectionContent);
   }
 
@@ -467,7 +467,7 @@ const createCollectionFromBrunoObject = async (collection, dirPath) => {
     fs.mkdirSync(envDirPath, { recursive: true });
 
     for (const env of collection.environments) {
-      const content = await stringifyEnvironment(env);
+      const content = await stringifyEnvironment(env, { format: 'bru' });
       const filename = sanitizeName(`${env.name}.bru`);
       fs.writeFileSync(path.join(envDirPath, filename), content);
     }
diff --git a/packages/bruno-electron/src/ipc/collection.js b/packages/bruno-electron/src/ipc/collection.js
index 936a7dace..3e4a8ed02 100644
--- a/packages/bruno-electron/src/ipc/collection.js
+++ b/packages/bruno-electron/src/ipc/collection.js
@@ -761,7 +761,7 @@ const registerRendererEventHandlers = (mainWindow, watcher) => {
       const environmentWithInfo = (environment) => ({
         name: environment.name,
         variables: environment.variables,
-        color: environment.color,
+        color: environment.color ?? undefined,
         info: {
           type: 'bruno-environment',
           exportedAt: new Date().toISOString(),
diff --git a/packages/bruno-electron/src/utils/collection-import.js b/packages/bruno-electron/src/utils/collection-import.js
index f1b9b5cb8..8ddc08b25 100644
--- a/packages/bruno-electron/src/utils/collection-import.js
+++ b/packages/bruno-electron/src/utils/collection-import.js
@@ -100,13 +100,13 @@ async function importCollection(collection, collectionLocation, mainWindow, uniq
   let brunoConfig = getBrunoJsonConfig(collection);
 
   if (format === 'yml') {
-    const collectionContent = await stringifyCollection(collection.root, { format });
+    const collectionContent = await stringifyCollection(collection.root, brunoConfig, { format });
     await writeFile(path.join(collectionPath, 'opencollection.yml'), collectionContent);
   } else if (format === 'bru') {
     const stringifiedBrunoConfig = await stringifyJson(brunoConfig);
     await writeFile(path.join(collectionPath, 'bruno.json'), stringifiedBrunoConfig);
 
-    const collectionContent = await stringifyCollection(collection.root, { format });
+    const collectionContent = await stringifyCollection(collection.root, brunoConfig, { format });
     await writeFile(path.join(collectionPath, 'collection.bru'), collectionContent);
   } else {
     throw new Error(`Invalid format: ${format}`);
diff --git a/tests/environments/multiline-variables/write-multiline-variable.spec.ts b/tests/environments/multiline-variables/write-multiline-variable.spec.ts
index ca4855be1..5e8205668 100644
--- a/tests/environments/multiline-variables/write-multiline-variable.spec.ts
+++ b/tests/environments/multiline-variables/write-multiline-variable.spec.ts
@@ -2,8 +2,6 @@ import { test, expect } from '../../../playwright';
 
 test.describe('Multiline Variables - Write Test', () => {
   test('should create and use multiline environment variable dynamically', async ({ pageWithUserData: page }) => {
-    test.setTimeout(60 * 1000);
-
     // open the collection
     const collection = page.getByTestId('collections').locator('#sidebar-collection-name').filter({ hasText: 'multiline-variables' });
     await expect(collection).toBeVisible();
diff --git a/tests/request/headers/header-validation.spec.ts b/tests/request/headers/header-validation.spec.ts
index 781107aca..4c5c62fab 100644
--- a/tests/request/headers/header-validation.spec.ts
+++ b/tests/request/headers/header-validation.spec.ts
@@ -58,7 +58,10 @@ test.describe.serial('Header Validation', () => {
 
       // Verify the error icon is not visible
       const errorIcon = headerRow.locator('.text-red-600');
-      await expect(errorIcon).not.toBeVisible();
+
+      // wait for formik to revalidate
+      await headerRow.click();
+      await expect(errorIcon).not.toBeVisible({});
     });
   });