diff --git a/.env.sample b/.env.sample
index 0617a17..6dfbb54 100644
--- a/.env.sample
+++ b/.env.sample
@@ -8,7 +8,7 @@ CONTENTSTACK_ENVIRONMENT=your_environment_token
 
 # Below config options are for enabling live preview/live edit tags for the starter app
 
-CONTENTSTACK_PREVIEW_HOST= rest-preview.contentstack.com
+# CONTENTSTACK_PREVIEW_HOST= rest-preview.contentstack.com  -- it will be generated runtime from CONTENTSTACK_APP_HOST
 CONTENTSTACK_PREVIEW_TOKEN= your_live_preview_token
 CONTENTSTACK_APP_HOST=app.contentstack.com
 CONTENTSTACK_LIVE_PREVIEW= true
diff --git a/.talismanrc b/.talismanrc
index 345ca2f..655bfb6 100644
--- a/.talismanrc
+++ b/.talismanrc
@@ -2,4 +2,8 @@ fileignoreconfig:
 - filename: .github/workflows/secrets-scan.yml
   ignore_detectors:
     - filecontent
+- filename: .env.sample
+  checksum: 5cb7389df244ea0f5c62e6f156ea038d0725e46d52662ca479e671108bdd966b
+- filename: setenv.ts
+  checksum: 243eb74a14fc02eaacd1e632b498387b946b929807ff8687931bb1e530002541
 version: "1.0"
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 03d7d2d..1a2802f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Contentstack
+Copyright (c) 2025 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.
diff --git a/package-lock.json b/package-lock.json
index d225fc2..d727550 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
         "yargs": "^17.7.2"
       },
       "engines": {
-        "node": "^14 || ^16"
+        "node": ">=18.0.0"
       }
     },
     "../../../package": {
diff --git a/package.json b/package.json
index 102021e..f3da61e 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "config": "ts-node setenv.ts"
   },
   "engines": {
-    "node": "^14 || ^16"
+    "node": ">=18.0.0"
   },
   "license": "MIT",
   "author": "Contentstack",
diff --git a/setenv.ts b/setenv.ts
index 541356e..afab81e 100644
--- a/setenv.ts
+++ b/setenv.ts
@@ -11,6 +11,12 @@ const stackConfig = {
   branch: process.env.CONTENTSTACK_BRANCH || 'main',
   region: process.env.CONTENTSTACK_REGION || 'us',
 };
+
+// Calculate preview_host from app_host if available and preview_host is not explicitly set
+const appHost = process.env.CONTENTSTACK_APP_HOST;
+const previewHost = process.env.CONTENTSTACK_PREVIEW_HOST || 
+                   (appHost ? appHost.replace('app', 'rest-preview') : undefined);
+
 const environmentFileContent = `
 export const environment = {
   production: true
@@ -23,7 +29,7 @@ export const Config = {
   branch: '${process.env.CONTENTSTACK_BRANCH || 'main'}',
   region: '${process.env.CONTENTSTACK_REGION || 'us'}',
   preview_token:'${process.env.CONTENTSTACK_PREVIEW_TOKEN}',
-  preview_host:'${process.env.CONTENTSTACK_PREVIEW_HOST}',
+  preview_host:'${previewHost}',
   api_host:'${process.env.CONTENTSTACK_API_HOST}',
   app_host:'${process.env.CONTENTSTACK_APP_HOST}',
   live_preview:${process.env.CONTENTSTACK_LIVE_PREVIEW || true}