diff --git a/CHANGELOG.md b/CHANGELOG.md
index a76a03d875..4832a339f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ Our versioning strategy is as follows:
 
 ## Unreleased
 
+### 🐛 Bug Fixes
+
+* `[templates/nextjs]` `[templates/react]` `[templates/vue]` `[templates/angular]` Changed formatting in temp/config to prevent parse issues in Unix systems ([#1787](https://github.com/Sitecore/jss/pull/1787))
+
 ## 22.0.0
 
 ### 🛠 Breaking Changes
diff --git a/docs/upgrades/unreleased.md b/docs/upgrades/unreleased.md
index 268a01baec..59bf28c540 100644
--- a/docs/upgrades/unreleased.md
+++ b/docs/upgrades/unreleased.md
@@ -1 +1,42 @@
 ## Unreleased
+
+# react
+
+* Replace `scripts/generate-config.js` if you have not modified it. Otherwise:
+    * Replace comma before a newline (`,`) with semicolon (`;`) in configText prop assignment so it would look like this:
+        
+        ```
+            configText += `config.${prop} = process.env.REACT_APP_${constantCase(prop)} || "${
+                config[prop]
+            }";\n`;
+        ```
+
+# angular
+
+* Replace `scripts/generate-config.ts` if you have not modified it. Otherwise:
+    * Replace comma before a newline (`,`) with semicolon (`;`) in configText prop assignment so it would look like this:
+        
+        ```
+            configText += `config.${prop} = process.env.${constantCase(prop)} || "${config[prop]}";\n`;
+        ```
+
+
+# vue
+
+* Replace `scripts/generate-config.js` if you have not modified it. Otherwise:
+    * Replace comma before a newline (`,`) with semicolon (`;`) in configText prop assignment so it would look like this:
+        
+        ```
+            configText += `config.${prop} = process.env.VUE_APP_${constantCase(prop)} || "${
+                config[prop]
+            }";\n`;
+        ```
+
+# nextjs
+
+* Replace `scripts/generate-config.ts` if you have not modified it. Otherwise:
+    * Replace comma before a newline (`,`) with semicolon (`;`) in configText prop assignment so it would look like this:
+        
+        ```
+            configText += `config.${prop} = process.env.${constantCase(prop)} || '${config[prop]}';\n`;
+        ```
diff --git a/packages/create-sitecore-jss/src/templates/angular/scripts/generate-config.ts b/packages/create-sitecore-jss/src/templates/angular/scripts/generate-config.ts
index ab6ca1c5c5..aa6f3dbe02 100644
--- a/packages/create-sitecore-jss/src/templates/angular/scripts/generate-config.ts
+++ b/packages/create-sitecore-jss/src/templates/angular/scripts/generate-config.ts
@@ -50,7 +50,7 @@ const config = {};\n`;
 
   // Set base configuration values, allowing override with environment variables
   Object.keys(config).forEach((prop) => {
-    configText += `config.${prop} = process.env.${constantCase(prop)} || "${config[prop]}",\n`;
+    configText += `config.${prop} = process.env.${constantCase(prop)} || "${config[prop]}";\n`;
   });
   // Set computed values, allowing override with environment variables
   Object.keys(computedConfig).forEach((prop) => {
diff --git a/packages/create-sitecore-jss/src/templates/nextjs/scripts/generate-config.ts b/packages/create-sitecore-jss/src/templates/nextjs/scripts/generate-config.ts
index ab2acf96d3..3f4190ca84 100644
--- a/packages/create-sitecore-jss/src/templates/nextjs/scripts/generate-config.ts
+++ b/packages/create-sitecore-jss/src/templates/nextjs/scripts/generate-config.ts
@@ -53,7 +53,7 @@ const config = {};\n`;
 
   // Set configuration values, allowing override with environment variables
   Object.keys(config).forEach(prop => {
-    configText += `config.${prop} = process.env.${constantCase(prop)} || '${config[prop]}',\n`;
+    configText += `config.${prop} = process.env.${constantCase(prop)} || '${config[prop]}';\n`;
   });
 
   configText += `module.exports = config;`;
diff --git a/packages/create-sitecore-jss/src/templates/react/scripts/generate-config.js b/packages/create-sitecore-jss/src/templates/react/scripts/generate-config.js
index d2eed7f7bd..384c0d8e0b 100644
--- a/packages/create-sitecore-jss/src/templates/react/scripts/generate-config.js
+++ b/packages/create-sitecore-jss/src/templates/react/scripts/generate-config.js
@@ -52,7 +52,7 @@ const config = {};\n`;
   Object.keys(config).forEach(prop => {
     configText += `config.${prop} = process.env.REACT_APP_${constantCase(prop)} || "${
       config[prop]
-    }",\n`;
+    }";\n`;
   });
   configText += 'module.exports = config;';
 
diff --git a/packages/create-sitecore-jss/src/templates/vue/scripts/generate-config.js b/packages/create-sitecore-jss/src/templates/vue/scripts/generate-config.js
index adcdca1213..9020cfba69 100644
--- a/packages/create-sitecore-jss/src/templates/vue/scripts/generate-config.js
+++ b/packages/create-sitecore-jss/src/templates/vue/scripts/generate-config.js
@@ -47,7 +47,7 @@ const config = {};\n`;
   Object.keys(config).forEach((prop) => {
     configText += `config.${prop} = process.env.VUE_APP_${constantCase(prop)} || "${
       config[prop]
-    }",\n`;
+    }";\n`;
   });
   // Set computed values, allowing override with environment variables
   Object.keys(computedConfig).forEach((prop) => {